it works
Merge branch 'session' into dev
Merge branch 'dev' of github.com:lintubongarit/sulka into dev

Conflicts:
	src/main/java/edu/helsinki/sulka/controllers/LoginController.java