去掉了模版里的时间判断
Merge branch 'develop'

Conflicts:
	app/templates/index.html