Machakos/Kitui Bugs
1.Regimens showing even when disabled in dispensing
2.Duplicate Submit for setting esp regimens and drugs
3.Remove Password Expiry
4.Remove auto-update
Merge branch 'master' of https://github.com/KevinMarete/ADT
Conflicts:
application/controllers/user_management.php
	application/views/sections/link.php
	assets/viral_load.json