lots of changes
Merge branch 'Hjelm-givakt'

Conflicts:
	utvalda-projekt.html