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

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

Conflicts:s
	application/controllers/order.php
	application/views/orders/fmap_template.php
	application/views/orders/order_v.php
	application/views/sections/link.php