Some refactoring and improvements of existing functionalitry.
Merge branch 'master' of https://github.com/prosjektstotte/sp-prosjektportal