Merge origin/MainBranch into MainBranch

Conflicts:
	src/Agents/AircraftAgent.java
Merge origin/MainBranch into MainBranch

Conflicts:
	src/Agents/AircraftAgent.java
Merge origin/MainBranch into MainBranch

Conflicts:
	APDescription.txt
	MTPs-Main-Container.txt
	src/Agents/AircraftAgent.java
Made the GUI to 2D and  checkbox to the grid.
Merge origin/MainBranch into MainBranch

Conflicts:
	APDescription.txt
	MTPs-Main-Container.txt
	src/Agents/AircraftAgent.java
Test
Merge origin/MainBranch into MainBranch

Conflicts:
	nbproject/private/private.properties
	nbproject/project.properties