Merge branch 'master' of https://github.com/SLUGIS/slugisdata

Conflicts:
	facilities/facilitiesSLU.geojson
conflict resolution