Merge branch 'master' of https://github.com/kdanglot/insset-airlines.git
Merge branch 'master' of https://github.com/kdanglot/insset-airlines.git
Merge branch 'master' of https://github.com/kdanglot/insset-airlines.git
Merge branch 'master' of https://github.com/kdanglot/insset-airlines.git

Conflicts:
	aeroport/application/controllers/CommercialController.php