Card #48 fix for saving a group
Merge remote-tracking branch 'origin/develop' into develop