Merge branch 'master' into develop
DDBEASY 267 - Remove service from user menu.
Merge branch 'DDBEASY-267' into develop
Merge branch 'develop'