Fix tests doing things out of order
Fix incorrect loading order in karma config
Add more information to app starting template
Merge branch 'master' into passport

Conflicts:
	client/app/app.scss