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

Conflicts:
application/controllers/inventory_management.php
Merge branch 'master' of https://github.com/jgat2012/ADT
updater