#1077 - Group and its children are hidden after being grouped again
#1065 - Can't add a question inside a group (on staging)
merging conflict
Merge pull request #362 from kobotoolbox/row-grouping

#1077 - Group and its children are hidden after being grouped again