首页调整
Merge branch 'master' of https://github.com/shoy160/Shoy.HtmlProject

Conflicts:
	100hgv2.0/css/common-v2.ie8b.css
促销区域