changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:fd
	application/views/sections/link.php
database
update status change date
Merge branch 'master' of https://github.com/jgat2012/ADT
changes
AMC Resupply
changes
changes
link
Merge branch 'master' of https://github.com/KevinMarete/ADT
Conflicts:
	application/config/database.php
	application/views/sections/link.php