added login screen
Merge branch 'master' of https://github.com/JohannesHeidecke/tiime-front

Conflicts:
	www/js/controllers.js