cleanup
Merge branch 'master' of https://github.com/UKMNorge/UNG2014

Conflicts:
	img/logoer/logo-kulturskoleradet.png