Changes made by Lachezar Lechev (luudman@gmail.com).
Changes made by Lachezar Lechev (luudman@gmail.com).
Merge branch 'master' of https://github.com/skittle/TeamUp.git

Conflicts:
	Events app/event.html
	Events app/index.html
	Events app/scripts/app/login.js
	Events app/scripts/app/usersList.js