sd
Merge branch 'master' of https://github.com/xichen744/vv_video
123
Merge branch 'master' of https://github.com/xichen744/vv_video

Conflicts:
	vv/bin/classes.dex
	vv/bin/vv.apk
	vv/src/com/tencent/business/activity/VVMovieDetailActivity.java