Merge branch 'style' into CN-33

Conflicts:
	app/index.html
	app/styles/style.scss