Index.html cleanup
Merge branch 'master' of https://github.com/1Copenut/generator-SPA

Conflicts:
	app/templates/index.html