Fylke-kontroller
Merge branch 'master' of https://github.com/UKMNorge/UKMresponsive

Conflicts:
	controller/view/fylke.controller.php