Resolve merge conflicts master into devicesettings

communication/include/communication.h

@@ -58,6 +58,6 @@ private:
 	void readTask();
 };
 
-};
+}
 
 #endif

communication/include/icommunication.h

@@ -38,6 +38,6 @@ protected:
 	std::atomic<bool> closing{false};
 };
 
-};
+}
 
 #endif

communication/include/multichannelcommunication.h

@@ -98,6 +98,6 @@ private:
 	void readTask();
 };
 
-};
+}
 
 #endif

communication/include/network.h

@@ -400,6 +400,6 @@ private:
 	}
 };
 
-};
+}
 
 #endif