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

Conflicts:
	application/controllers/inventory_management.php
	application/views/bin_card_v.php
	application/views/stock_transaction_v.php
	assets/cache/13790745386b643dd89797e523514f23999360dbd5.js
	assets/cache/13798644596b643dd89797e523514f23999360dbd5.js
	assets/cache/13806289757b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/13807188447b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/13814167096b643dd89797e523514f23999360dbd5.js
	assets/cache/13814191267b0bbd27a4acf15a38e2865ca72cbe4f.css
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/controllers/inventory_management.php
	application/views/bin_card_v.php
	application/views/stock_transaction_v.php
	assets/cache/13790745386b643dd89797e523514f23999360dbd5.js
	assets/cache/13806289757b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/13817796726b643dd89797e523514f23999360dbd5.js
	assets/cache/13819958656b643dd89797e523514f23999360dbd5.js
	assets/cache/13823040727b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/13823584517b0bbd27a4acf15a38e2865ca72cbe4f.css d