完成首页开发
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/common/base.tpl
	views/home/index.tpl