Merge branch 'master' into socketio

Conflicts:
	client/app/main/main.html
	client/app/main/main.scss
	client/assets/images/yeoman.png
	karma.conf.js
Change input text
Merge branch 'socketio' into passport-socketio

Conflicts:
	client/app/main/main.html