loker
lokMerge branch 'master' of github.com:hybrida/hybridaweb2-play

Conflicts:
	conf/routes
dette er viktigMerge branch 'master' of github.com:hybrida/hybridaweb2-play
Merge branch 'master' of github.com:hybrida/hybridaweb2-play

Conflicts:
	conf/routes
viktigMerge branch 'master' of github.com:hybrida/hybridaweb2-play