Move exports to csv format
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
don't crash on custom exports with no tables configured
use session storage for django messages

fixes india server cookie error that prevents people from using the site
indefinitely (until cookies are cleared) after a django message is set
that has html content
check that couch_user is an instance of WebUser when verifying billing_admin
Merge pull request #2567 from dimagi/fix-india-messages-html

use session storage for django messages
Merge pull request #2568 from dimagi/billing-admin-fix

check that couch_user is an instance of WebUser when verifying billing_admin
Merge pull request #2566 from dimagi/cz

don't crash on custom exports with no tables configured
catch BulkSaveError and display message to user

log specifics of error in case that helps us debug why this happens
update 1 USD to read 1 USD /month
update translations, and add fra translation for 1 USD /month
compile translations
don't import memory-heavy phonenumbers module unless it is needed

the GEOCODE_DATA is 6MB and gets imported with `import phonenumbers`
Merge pull request #2571 from dimagi/memory-fixes

don't import memory-heavy phonenumbers module unless it is needed
update submodules
Merge pull request #2569 from dimagi/group-bulksaveerror

catch BulkSaveError and display message to user
handle ModuleNotFoundException
Merge pull request #2572 from dimagi/mnfe

handle ModuleNotFoundException