Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj

处理冲突

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -76,6 +76,7 @@
 
 /* Begin PBXFileReference section */
 		04F526AE2B32D4B600FC6CE6 /* YHPersonalCenterCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonalCenterCell.swift; sourceTree = "<group>"; };
+		04F526BF2B39733000FC6CE6 /* galaxy-Bridge-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "galaxy-Bridge-Header.h"; sourceTree = "<group>"; };
 		04FAC5422B32BA5F00D24B36 /* YHHomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeViewController.swift; sourceTree = "<group>"; };
 		04FAC5442B32BA7000D24B36 /* YHMyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyViewController.swift; sourceTree = "<group>"; };
 		04FAC5492B32CF1000D24B36 /* YHNetRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNetRequest.swift; sourceTree = "<group>"; };
@@ -168,6 +169,7 @@
 		04F526BD2B3524B400FC6CE6 /* Others */ = {
 			isa = PBXGroup;
 			children = (
+				04F526BF2B39733000FC6CE6 /* galaxy-Bridge-Header.h */,
 			);
 			path = Others;
 			sourceTree = "<group>";