Card #48 added types of role and mapping for group features
Merge remote-tracking branch 'origin/develop' into develop