Merge remote-tracking branch 'origin/developer' into feature/Controller

Added support for second controller
# Conflicts:
#	CrystalPoint.cpp
#	CrystalPoint.h
#	CrystalPoint.vcxproj
#	CrystalPoint.vcxproj.filters

ControllerHandler.h

@@ -5,13 +5,21 @@
 
 #define BasestationBaudrate 115200
 #include <thread>
+
+#ifdef WIN32
 #include "include/serial.h"
+#else
+#include "lib/serial/include/serial.h"
+#endif
+
+
 #include "Controller.h"
 
 class ControllerHandler{
 public:
     ControllerHandler();
     Controller* getLeftController(void);
+    Controller* getRightController(void);
     void rumble(int idController, int duration, int power);
 private:
     void SearchBasestation(void);
@@ -20,7 +28,7 @@ private:
     bool basestationFound;
     serial::Serial *baseStation;
     std::thread readthread;
-    std::vector<Controller*> controllers {0};
+    Controller* controllers[4];
 
     //Command functions
     void commandDebug(std::vector<std::string> data);