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

Conflicts:
	application/modules/inventory/controllers/inventory.php