Upload Maps
Merge branch 'master' of https://github.com/KevinMarete/NASCOP
Conflicts:
	application/controllers/order.php
Merge branch 'master' of https://github.com/jgat2012/NASCOP

Conflicts:
	application/controllers/order.php
Changes
changes