a
a
a
a
a
as
a
a
a
a
a
a
a
a
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/geoJSON/Feature.java
	src/geoJSON/FeatureCollection.java
	src/mapCandidates/DistrictMap.java
	src/mapCandidates/Ecology.java
	src/ui/MainFrame.java
	src/ui/MapPanel.java