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

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

Conflicts:
	application/controllers/dispensement_management.php
	application/controllers/patient_management.php
	application/views/dispense_v.php
	application/views/patient_listing_v.php
	application/views/sections/link.php
Merge branch 'master' of https://github.com/EuniceManyasi/ADT

Conflicts:
	Export/AGGR#201401.xls
	application/config/database.php
	application/controllers/patient_management.php
	application/views/report_v.php
	application/views/sections/link.php
changes
changes
Password length
changes