Merge remote-tracking branch 'remotes/origin/locky' into dev

Controller/SerialNumberController.py

@@ -251,7 +251,7 @@ class SerialNumberView(View):
                     if dev.exists():
                         dev.update(serial_number=serial_number)
 
-                    full_uid_code = uid.uid__full_uid_code
+                    full_uid_code = uid.full_uid_code
                     if uid.platform in CRCKey.keys():
                         full_uid_code += ':'+CRCKey[uid.platform]