jhg
Merge branch 'master' of https://github.com/havhol/my_daughters_promnight_site

Conflicts:
	app/archive.html
	app/index.html
	app/kalender.html
	app/org_enhet.html
	app/org_enhet_list.html
	app/search.html
	dist/archive.html
	dist/index.html
	dist/kalender.html
	dist/org_enhet.html
	dist/org_enhet_list.html
	dist/search.html