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

Conflicts:
	application/controllers/order.php
	application/views/orders/fmap_template.php
	application/views/orders/order_v.php
	application/views/sections/link.php
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	Export/F-CDRR#2  2014-01-01 to 2014-01-31.xls
	application/controllers/order.php
	wapplication/views/orders/fmap_template.phpw
	application/views/orders/order_v.php
	application/views/sections/link.php