nye ting
Merge branch 'master' of https://github.com/toregjerdrum/teamkjekkas

Conflicts:
	TeamKjekkasWeb/lang/pageTypes.NO.xml