buggy login
Merge branch 'master' into add_logout

Conflicts:
	public/js/app.js