Merged with master branch and resolved the conflict
Updated the way we handle awaiting and approved memberships.
Merged the feature branch and resolved the content conflicts