12112212
Merge branch 'master' of https://github.com/RenXLin/yoga

Conflicts:
	yoga/VideoPlayerController.m