Merge branch 'master' of heroku.com:milou

Conflicts:
	src/main/webapp/resources/js/logins.js