，，，，
Merge branch 'master' of https://github.com/LeiYang9010/TheMusicCamera

Conflicts:
	TheMusicCamera/camera/CameraController.m