orders
Merge branch 'master' of https://github.com/jgat2012/NASCOP
database
orders
orders
design
Merge branch 'master' of https://github.com/KevinMarete/NASCOP

Conflicts:
	application/controllers/sync.php