Add GroupType enum for choice and sequence + property
Merge branch 'Shaul'