....
Merge branch 'master' of https://github.com/QiMeng/QMPhoto

Conflicts:
	QMPhoto/QMPhoto.xcodeproj/project.pbxproj