login + getusers
Merge branch 'master' of https://github.com/marcojansen/NotFlix

Conflicts:
	NotFlix/WebContent/javascript.js