MAPs changes
Merge branch 'master' of https://github.com/KevinMarete/ADT
Maps
Updates
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