Resolve merge conflicts master into devicesettings

device/plasion/include/neoviion.h

@@ -25,6 +25,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/plasion/include/neoviplasma.h

@@ -25,6 +25,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/plasion/include/plasion.h

@@ -17,6 +17,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif