Merge branch 'master' of https://github.com/KevinMarete/webadt

Conflicts:
	assets/scripts/migration.js
Merge branch 'master' of https://github.com/jgat2012/WebADT

Conflicts:
	application/modules/migration/views/migration.php
	assets/scripts/migration.js