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

Conflicts:
	application/controllers/inventory_management.php
	application/controllers/order.php
	application/views/dispense_v.php
	application/views/sections/link.php
MAPS
Search
Search css
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/dispense_v.php
	application/views/sections/link.php