Merge origin/MainBranch into MainBranch

Conflicts:
	src/Agents/AirportAgent.java
	src/Agents/GUIAgent.java
Merge origin/MainBranch into MainBranch

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

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

Conflicts:
	src/Agents/GUIAgent.java
GUI elements
GUI elements
Merge origin/MainBranch into MainBranch
GUI elements
GUI elements
Merge origin/MainBranch into MainBranch

Conflicts:
	src/Agents/AircraftAgent.java