Fix switch user hierarchy
Merge branch 'devel' of psoto:Exartu/Exartu-CRM into devel