Merge origin/MainBranch into MainBranch

Conflicts:
	APDescription.txt
	MTPs-Main-Container.txt
	nbproject/private/private.properties
Merge origin/MainBranch into MainBranch

Conflicts:
	APDescription.txt
	MTPs-Main-Container.txt
	nbproject/private/private.properties
Merge origin/MainBranch into MainBranch

Conflicts:
	APDescription.txt
	MTPs-Main-Container.txt
	src/mediator/AircraftManager.java
Merge origin/MainBranch into MainBranch

Conflicts:
	APDescription.txt
	MTPs-Main-Container.txt
	src/mediator/AircraftManager.java