home page
Merge branch 'router' into develop

Conflicts:
	app/config/config.yml