updates from marete,jgat
annoying updates
Merge branch 'master' of https://github.com/KevinMarete/ADT
start regimen date error fix
reports additional columns
List other regimens in other regimens comment box in fmaps
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	assets/viral_load.json
Fixed bug in dashboard. Patients expected to visit
Select dispensing point mandatory when dispensing.
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/regimen_drug_listing_v.php
	application/views/template.php
	assets/viral_load.json
pregnant patients on pmtct service
pregnant women on pmtct service
no message
modified ADT manual
Bug in regimen and drugs merging fixed
Merge branch 'master' of https://github.com/wambuimungai/ADT

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

Conflicts:
	application/views/sections/link.php
	application/views/template.php
	assets/viral_load.json
merged with abdala regimen drug issue fixed