update
update
Merge branch 'master' into master11

Conflicts:
	Podfile
	Podfile.lock
	Pods/Manifest.lock
	Pods/Pods.xcodeproj/project.pbxproj