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

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

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

Conflicts:
	application/controllers/auto_management.php
	application/views/sections/link.php
	application/views/template.php
Maps issues
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/orders/cdrr_template.php
Notifications ( satellites)
maps OC/CM
changes
Merge branch 'master' of https://github.com/jgat2012/ADT