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

Conflicts:s
	application/views/sections/link.php
	assets/cache/139218945349f25aa95fd49fa6ddbc7412f58cee6b.css
	assets/cache/139219220249f25aa95fd49fa6ddbc7412f58cee6b.css
	assets/cache/139219281449f25aa95fd49fa6ddbc7412f58cee6b.css
orders
orders
Merge branch 'master' of https://github.com/jgat2012/NASCOP

Conflicts:wa
	application/views/sections/link.php
	assets/cache/139219220249f25aa95fd49fa6ddbc7412f58cee6b.css
	assets/cache/139219281449f25aa95fd49fa6ddbc7412f58cee6b.css
	assets/cache/139220226549f25aa95fd49fa6ddbc7412f58cee6b.css
orders
emails
orders
orders
Merge branch 'master' of https://github.com/KevinMarete/NASCOP

Conflicts:
	Export/Stock.xls
	application/controllers/dashboard_management.php
	application/controllers/order.php
	application/views/sections/link.php
	assets/cache/1391758324db1fd474fa892a5f41f1f257dbfaeb7e.js
	assets/cache/1391897192b8f1d40c05735fe8c534f860e905a27f.js
	assets/cache/139220226549f25aa95fd49fa6ddbc7412f58cee6b.css
	assets/cache/139230015138652f7f20d5676664079c2835f3d210.css
	assets/cache/139262929149f25aa95fd49fa6ddbc7412f58cee6b.css
	assets/cache/1392639251b8f1d40c05735fe8c534f860e905a27f.js