little things
Merge branch 'after_delivery_date' of https://github.com/Lucas-Andrade/Grupo-3-EHL into after_delivery_date

Conflicts:
	bin/airtrafficcontrol/app/menuoptions/MonitorAirTrafficOption.class
	bin/airtrafficcontrol/app/utils/ReportGenerator.class