Updates
Drugs balance
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
application/controllers/user_management.php
	application/views/change_password_v.php
	application/views/dispense_v.php
	assets/cache/137421393728432daf53b10f0aedc7bf6db22457d6.css
	assets/cache/13742178720b7dbc59281f60eb653fe7bdd22f3e2d.js
	assets/cache/137501056128432daf53b10f0aedc7bf6db22457d6.css
	assets/cache/13750151070b7dbc59281f60eb653fe7bdd22f3e2d.js
	assets/cache/13754417330b7dbc59281f60eb653fe7bdd22f3e2d.js
	assets/cache/137555514628432daf53b10f0aedc7bf6db22457d6.css
Drug stock movement
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Conflicts:
	assets/cache/13754417330b7dbc59281f60eb653fe7bdd22f3e2d.js
	assets/cache/137555514628432daf53b10f0aedc7bf6db22457d6.css
	assets/cache/13758741718b2db8a989fca9d7a2b48449da4f7073.js
	assets/cache/137587475928432daf53b10f0aedc7bf6db22457d6.css
	assets/cache/13759107360b7dbc59281f60eb653fe7bdd22f3e2d.js
	assets/cache/137591073628432daf53b10f0aedc7bf6db22457d6.css
Merge branch 'master' of https://github.com/jgat2012/ADT