Collapsable bugfixes
Merge branch 'refs/heads/collapsable' into dev

Conflicts:
	css/dist/cmb.min.css
	css/src/group.css