Alterações FligthPlan
Merge branch 'master' of https://github.com/mcGoncalo/AirTrafficControl

Conflicts:
	src/airtrafficcontrol/app/utils/Airliner.java
	src/airtrafficcontrol/app/utils/Airship.java
	src/airtrafficcontrol/app/utils/CargoAircraft.java
	src/airtrafficcontrol/app/utils/CivilCargoAirCraft.java
	src/airtrafficcontrol/app/utils/PrivateJet.java