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

# Conflicts:
#	assets/resources/module/login/login.prefab

assets/resources/module/login/login.prefab

@@ -40,13 +40,10 @@
       },
       {
         "__id__": 39
-      },
-      {
-        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1444,19 +1441,6 @@
     "_id": ""
   },
   {
-    "__type__": "fa881XikspIl7sX7YCTSOCC",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "start_move_time": 0.1,
-    "end_move_time": 0.3,
-    "item_count": 10,
-    "_id": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1