don't crash on integer site codes in bulk user upload
Merge pull request #3317 from dimagi/cz

don't crash on integer site codes in bulk user upload
Merge pull request #3306 from dimagi/reminder-save-performance

Reminder rule performance
update submodule refs
cleanup cache invalidation
add deleted flag
relative import
Merge pull request #3318 from dimagi/cache-cleanup

cleanup cache invalidation
add CachedCouchDocumentMixin and use for default consumption values
fix for app builder bug

http://manage.dimagi.com/default.asp?111475
Merge pull request #3320 from dimagi/app-builder-hotfix

fix for app builder bug
run generate_invoices based on arbitrary dates
make locations a cacheable document
Merge pull request #3321 from dimagi/extend-management-cmd

run generate_invoices based on arbitrary dates
Fix bug in inventory aggregate report
Merge remote-tracking branch 'origin/multimedia-case-properties' into autostaging
Merge remote-tracking branch 'origin/sql-dailyformstats' into autostaging
Merge remote-tracking branch 'origin/pretty-user-display' into autostaging
Merge remote-tracking branch 'origin/report-issue-upload' into autostaging
Merge remote-tracking branch 'origin/commtrack-user' into autostaging