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

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

Conflicts:
	application/controllers/auto_management.php
	application/views/patient_listing_v.php
	application/views/sections/link.php