stub in a default consumption rate
don't exclude stale sites from commtrack reports; use their last reported value(s)
add commtrack consumption rate pillow
Merge branch 'master' into commtrack

Conflicts:
	settings.py
don't fail if a form in the previous build has an issue

fixes a bug in form versioning
fix a couple remote mm install issues

prune unused stuff from the multimedia map before iterating through it
be more lenient about the URIs used: only require they start with jr://file/
make copy_group_data work a little better
Merge pull request #294 from dimagi/copy-group-data

make copy_group_data work a little better
Merge pull request #293 from dimagi/media-suite-fix

fix a couple remote mm install issues
make the user api a base class for future use with web users
add web user resource
web user resource tests + bonus test for commcare user resource
api test cleanup
add role and permissions to web user api + tests
Merge pull request #289 from dimagi/commtrack

misc commtrack
Merge pull request #295 from dimagi/web-user-api

Web user api
temporarily fix breaking psi report by using proper location hierarchy
Merge pull request #297 from dimagi/psi-report-fix

temporarily fix breaking psi report by using proper location hierarchy
add username filtering and test
delete dead test