Development - Merge latest development branch for Issue #62

Group management features