group edit
Merge branch 'editGroup' into demo