Merge pull request #190 from CruGlobal/MH-750

Refactor permissions structure
Fix undefined method split for nil:NilClass
Merge branch 'master' of github.com:CruGlobal/missionhub
Fix organization cleanup - archiving contacts and leaders
Merge branch 'MH-639' into dev