from nascop
-Reports: Patient Missing appointment report bug fixed
-Reports: List of patients started on a certain period(visiting patient category), bug fixed
-Commented auto logout feature
regimen drugs fix
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
 Scripts
- Commented password expiry check
- Error Notification listing fixed
Isoniazid start and end date save function implemented
 in edit patients view and add patients views.
prompt for confirmation before removing row and checking the quantity of each drug before dispensing
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
	assets/viral_load.json
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/sections/link.php
changelog updated
viral load
bootbox for regimens and drugcode merging
Merge branch 'master' of https://github.com/jgat2012/ADT
Merge branch 'master' of https://github.com/KevinMarete/ADT
F map updates
section link
Merge branch 'master' of https://github.com/KevinMarete/ADT
Conflicts:
application/controllers/user_management.php
	application/views/sections/link.php
	assets/viral_load.json
Merge branch 'master' of https://github.com/wambuimungai/ADT

Conflicts:
	application/views/sections/link.php
Merge branch 'master' of https://github.com/wambuimungai/ADT

Conflicts:
	application/controllers/user_management.php
	application/views/sections/link.php
	assets/cache/14090817461cd61b25796ccb6cbf22d8e1527cc816.css
	assets/viral_load.json