视频测试
Merge branch 'master' of https://github.com/hjin1987/andstu.git

Conflicts:
	AndStu/src/com/example/andstu/vedio/VedioPlayer.java
	AndStu/src/com/example/andstu/vedio/VedioTestActivity.java