Fix import to controller index.html
Merge origin/master

Conflicts:
	app/views/main.html