don't 500 when given a bad form_unique_id
Merge branch 'master' into 500-to-404
automatically set the project role to read only when adding a project to an org team
add support for inherited columns in BasicTabularReport
Merge pull request #710 from dimagi/aggregate-columns

add support for inherited columns in BasicTabularReport
small change
Merge pull request #711 from dimagi/quickie

small change
make cloudcare more resilient to submission errors
support user-data in cloudcare
Merge pull request #713 from dimagi/user-data-support

support user-data in cloudcare
Merge pull request #712 from dimagi/cz

make cloudcare more resilient to submission errors
rearrange odk deploy pane, add bitly link
Merge pull request #714 from dimagi/odk-bitly-link

rearrange odk deploy pane, add bitly link
some changes to orgs based on QA feedback
add functionality for renaming teams; other minor fixes
remove namespacing functionality for org projects; allow org admins to edit project display names
Merge pull request #715 from dimagi/orgs-qa-updates

Orgs qa updates
Merge pull request #674 from dimagi/orgs-remove-none

automatically set the project role to read only when adding a project to...
change slug to hr_name and don't restrict characters
add lazy migration for hr_name