Merge branch 'master' into develop
case 1854 - Use custom validation for user email in order to allow email sharing among different ALMA users.
case 1854 - Code clean-up.
Merge branch 'case-1854' into develop
Merge remote-tracking branch 'origin/develop'