Added login
Merge branch '1-1' into dev

Conflicts:
	www/templates/event.html