starting to work on authentication
Merge branch 'master' of https://github.com/cmorrent/we-ss2014

Conflicts:
	lab3/we-lab3-group74/app/controllers/UserManagement.java