Merge branch 'master' of https://github.com/krsjan/mapp-at-ifi

Conflicts:
	views/romoversikt.html
fixed errors