Changed the GUI to a JMapView
Merge origin/MainBranch into MainBranch

Conflicts:
	src/Agents/AircraftAgent.java