video detail page layout change
Merge branch 'master' of https://github.com/sczhang/zhutou4

Conflicts:
	WebContent/stage1/css/main.css