MAPs changes
Merge branch 'master' of https://github.com/KevinMarete/ADT
Maps
Updates
changes
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/config/database.php
	application/views/migration_v.php
	application/views/sections/link.php
Bugs
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/patient_listing_v.php
	application/views/sections/link.php
Changes
changes
Merge branch 'master' of https://github.com/jgat2012/ADT
changes
changes
ADT start
ADT start
settings, facility details
Database password change
Facility details
Merge branch 'master' of https://github.com/wambuimungai/ADT
issues changes