Fix bug where user could leave organization
Merge branch 'develop' into develop_main
Merge pull request #218 from aptivate/develop_main

Develop main