Resolve merge conflicts master into devicesettings

device/neovifire2/include/neovifire2.h

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

device/neovifire2/include/neovifire2eth.h

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

device/neovifire2/include/neovifire2usb.h

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