将改版后的页面作为新版皮肤，右上角提供切换皮肤对比功能
Merge remote-tracking branch 'WebTest/master'

Conflicts:
	promotion/detail.html