Merge branch 'master' of https://github.com/LeoIannacone/DroneMission

Conflicts:

workspace/.metadata-bkp/.plugins/org.eclipse.core.resources/.root/8.tree
	workspace/.metadata/.log
	workspace/.metadata/.plugins/org.eclipse.cdt.core/.log

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/it.uni
bo.droneMission.display/.markers

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/it.uni
bo.droneMission.display/org.eclipse.jdt.core/state.dat

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/it.uni
bo.droneMission.gauge/.markers

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/it.uni
bo.droneMission.gauge/org.eclipse.jdt.core/state.dat

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/it.uni
bo.droneMission.system/.markers

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/it.uni
bo.droneMission.system/org.eclipse.jdt.core/state.dat

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/it.uni
bo.droneMission.tests/.markers

workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.jdt.core/4049025974.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/771587729.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	workspace/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml

workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory
.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	workspace/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml