nu kompilerar den.
Merge branch 'master' of https://github.com/Jrende/IV1202

Conflicts:
	app/controllers/Application.java