1、修改了主页界面
2、优化了背景界面
靠
Merge remote-tracking branch 'origin/linyaohua' into dev

Conflicts:
	WebContent/WEB-INF/web.xml