Merge commit '14c809ff' into xiezhaolin

galaxy/galaxy/Res/Assets.xcassets/AppIcon.appiconset/Contents.json

 {
   "images" : [
     {
+      "filename" : "应用图标1024*1024.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

galaxy/galaxy/Res/Assets.xcassets/other/launch_screen_image.imageset/Contents.json

 {
   "images" : [
     {
+      "filename" : "超级app启动页占位图.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "launch_screen_image@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "launch_screen_image@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }