add organization information to users and settings
Merge pull request #608 from dimagi/settings-org

add organization information to users and settings