后台增加广告设置，前台首页滚动图展示广告。
Merge branch 'master' of https://github.com/guzeng/one

Conflicts:
	assets/css/home.css