refactored edit user groups, roles, features, preparing for group options based on roles, added securityservice
Merge remote-tracking branch 'origin/develop' into develop