lots of changes
Merge branch 'Hjelm-givakt'

Conflicts:
	utvalda-projekt.html
Merge branch 'marcus'

* marcus:
  Add proper layout to project overlay pages