before merge
successfully reverted
Merge branch 'master' of github.com:liuzenan/MusTale

Conflicts:
	Pods/Pods-environment.h
	Pods/Pods.xcodeproj/project.pbxproj