.
Merge branch 'master' of github.com:JaneJ/Milou
Merge branch 'master' of github.com:JaneJ/Milou

Conflicts:
	src/main/webapp/pages/login.html
Merge branch 'master' of github.com:JaneJ/Milou