修改次首页
Merge remote-tracking branch 'origin/develop_index'

Conflicts:
	app/views/layouts/application.html.erb