Added accordion support
Merge branch 'groups'