no message
Merge branch 'master' of https://github.com/zhjch80/RMVideo

Conflicts:
	RMVideo.xcodeproj/project.xcworkspace/xcshareddata/RMVideo.xccheckout