Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	config.ini
#	src/Program.cpp

include/Program.h

@@ -6,6 +6,7 @@
 #include "ServoMotorComponent.h"
 #include "NfcReader.h"
 #include "GRBL.h"
+#include "BigNfcReader.h"
 
 class Program {
 public:
@@ -27,6 +28,8 @@ private:
     ServoMotorComponent *servo;
     NfcReader *nfcReader;
     GRBL *grbl;
+    BigNfcReader* outputReader;
+    int grblUpdateTime;
 };
 
 #endif