On login redirect user appropriately
Merge branch 'master' of https://github.com/skittle/TeamUp.git

Conflicts:
	Events app/scripts/app/login.js