Basic static home layout
Merge branch 'master' into static-home

Conflicts:
	app/index.html
Merge branch 'static-home'