new order
cdrr
orders
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/controllers/order.phps
	application/controllers/order_management.php
	application/views/orders/cdrr_template.php
	application/views/orders/order_v.php
	application/views/sections/link.php
	assets/scripts/Merged_JS.js
users
git update
database
ADT Changes
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
application/controllers/inventory_management.php