Resolve merge conflicts master into devicesettings

device/include/device.h

@@ -78,6 +78,6 @@ private:
 	void enforcePollingMessageLimit();
 };
 
-};
+}
 
 #endif

device/include/devicefinder.h

@@ -12,6 +12,6 @@ public:
 	static std::vector<std::shared_ptr<Device>> FindAll();
 };
 
-};
+}
 
 #endif

device/include/neodevice.h

@@ -6,8 +6,10 @@
 #ifdef __cplusplus
 // A forward declaration is needed as there is a circular dependency
 namespace icsneo {
-	class Device;
-};
+
+class Device;
+
+}
 typedef icsneo::Device* devicehandle_t;
 #else
 typedef void* devicehandle_t;