helg
oppdatering til andreas
Merge branch 'master' of https://github.com/havhol/my_daughters_promnight_site

Conflicts:
	app/activity.html
	app/archive.html
	app/article.html
	app/develop/components/resources-footer.html
	app/fonts/DNKIcon-Regular-old.otf
	app/fonts/DNKIcon-Regular-old.png
	app/fonts/DNKIcon-Regular-old.ttf
	app/fonts/dnkicon-regular-webfont.eot
	app/fonts/dnkicon-regular-webfont.svg
	app/fonts/dnkicon-regular-webfont.ttf
	app/fonts/dnkicon-regular-webfont.woff
	app/index.html
	app/kalender.html
	app/list.html
	app/org_enhet.html
	app/org_enhet_list.html