Merge branch 'develop' into swiftLint-develop

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_hkTravel.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "香港境内出行预约@2x.png",
+      "filename" : "香港境内出行预约2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "香港境内出行预约@3x.png",
+      "filename" : "香港境内出行预约3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }