Add ressupply quantity and fix consumption bug

Was treating consumption as a monthly, not daily, value
Merge branch 'master' into resupply-quantity

Conflicts:
	submodules/casexml-src
Merge pull request #2564 from dimagi/resupply-quantity

Add ressupply quantity and fix consumption bug