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

Conflicts:
	application/views/sections/link.php
Change dispensed units to dispensed packs when downloading D-Cdrr
Caculation of aggregated data bug, D-MAPS
Finally fixed bug in generating D-MAPS
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/controllers/order.php
	application/views/sections/link.php
Merge pull request #27 from jgat2012/master

Finally fixed bug in generating D-MAPS