Merge branch 'master' into 重庆IFS

Conflicts:
	IFS/IFS/Resource/Assets.xcassets/AppIcon.appiconset/Contents.json
	IFS/IFS/Resource/Assets.xcassets/launchImage_bg.imageset/launchImage_bg@2x.png
	IFS/IFS/Resource/Assets.xcassets/launchImage_bg.imageset/launchImage_bg@3x.png
	IFS/IFS/Resource/Assets.xcassets/logo_bg.imageset/logo_bg@2x.png
	IFS/IFS/Resource/Assets.xcassets/logo_bg.imageset/logo_bg@3x.png

IFS/Podfile.lock

@@ -56,7 +56,7 @@ DEPENDENCIES:
   - YXKit
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
     - Alamofire
     - DeviceKit
     - DZNEmptyDataSet
@@ -112,4 +112,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: ca2deb99f65138a0ea1c4a431cc195f523594330
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.5.3