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

Conflicts:
	application/controllers/auto_management.php
	application/views/sections/link.php
	application/views/template.php
MAPS issue
Merge branch 'master' of https://github.com/jgat2012/ADT

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