First Changes
Changes
Merge branch 'master' of https://github.com/KevinMarete/webadt
Conflicts:
	.project
	application/config/autoload.php
	application/config/database.php
	application/libraries/Doctrine.php
Merge branch 'master' of https://github.com/KevinMarete/webadt

Conflicts:
Merge branch 'master' of https://github.com/jgat2012/WebADT

Conflicts:
	application/modules/migration/controllers/migration.php
changes