Maj Map
Merge branch 'master' of https://github.com/mats31/opendata

Conflicts:
	application/assets/javascripts/application.js