DAO Updated
Merge branch 'master' of https://github.com/ju2cho7/aerodrome

Conflicts:
	projetAerodrome/projetAerodrome/Controllers/AircraftController.cs
	projetAerodrome/projetAerodrome/Models/DBEntities.Designer.cs
	projetAerodrome/projetAerodrome/Models/DataBaseEntities.edmx
	projetAerodrome/projetAerodrome/Models/SQLFile.sql
	projetAerodrome/projetAerodrome/Web.config