Stuff
Merge branch 'master' of https://github.com/Utviklingsutvalget/ACTion

Conflicts:
	app/powerups/core/clubimage/powerup.scala.html
	app/views/user/registration/form.scala.html
	html/MatsTest.html
	html/css/style2.css
	html/profil/index_mats.html