Merge pull request #36 from jgat2012/master

Importing order issues and control
database settings
Fixed Issued/Received Drug Reports
D-CDRR report generate bug fix.
Lost followup report.
updated changelog
resupply calculator
fixed ordering bugs
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	assets/viral_load.json