Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

assets/resources/module/login/login.prefab

@@ -278,7 +278,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        362,
+        312,
         0,
         0,
         0,
@@ -349,7 +349,7 @@
     "_alignFlags": 1,
     "_left": 0,
     "_right": 0,
-    "_top": 150,
+    "_top": 200,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,