修改分类
Merge branch 'master' of https://github.com/msafin/gamevideo

Conflicts:
	android/src/com/sharegogo/video/MainActivity.java