s
Merge branch 'master' of git@github.com:yuanxiaoming/leshi.git

Conflicts:
	leyu/AndroidManifest.xml
	leyu/src/com/ch/leyu/ui/VideoPlayActivity.java