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

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

Conflicts:
	application/controllers/patient_management.php
	application/controllers/system_management.php
	application/views/dispense_v.php
	application/views/patient_listing_v.php
	application/views/sections/link.php
	assets/styles/select2-3.4.8/select2.css
changes
Merge branch 'master' of https://github.com/EuniceManyasi/ADT

Conflicts:
	application/views/patient_listing_v.php
	application/views/sections/link.php
changes 26th may