Merge branch 'filtered' into dfa-filtered
add multi user/group filter to daily form activity report
Track the last read message by user
Merge branch 'master' of github.com:dimagi/commcare-hq
Mark last read message in chat window
use single vellum includes

Depends on https://github.com/dimagi/Vellum/pull/156
refactor import of crispy.layout
Fix consumption uploading for new locations
don't attempt to process commtrack stuff in device reports
Merge pull request #2389 from dimagi/ct-device-reports

don't attempt to process commtrack stuff in device reports
implementing pro-bono form
Don't blow up on bad parent type errors
add link to pro-bono form
add settings to force consumption calculations to sync + tests
Merge pull request #2388 from dimagi/consumption_for_new_locations

Fix consumption uploading for new locations
Merge pull request #2390 from dimagi/parent_type_error

Don't blow up on bad parent type errors
update couchforms
Merge pull request #2394 from dimagi/refactor_forms

refactor import of crispy.layout
Merge pull request #2395 from dimagi/consumption-sync

add settings to force consumption calculations to sync + tests
update casexml