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
Use angular-ui collapse directive for navbar

fixes #11
Merge branch 'master' into passport

Conflicts:
	client/components/navbar/navbar.controller.js
Merge branch 'passport' into passport-socketio

Conflicts:
	client/app/main/main.html
	client/app/main/main.scss
	client/assets/images/yeoman.png
	karma.conf.js