Merge pull request #30 from jgat2012/master

Dispensing Module redesign and reports
Merge With Abdala added duplicate variable in order
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	assets/viral_load.json