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

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