[V2S1 US30-32] Added dynamic groups
Merge branch 'V2S1_US30'

Conflicts:
	ginco-admin/src/main/webapp/app/controller/ConceptGroupController.js
	ginco-admin/src/main/webapp/app/controller/ThesaurusTabPanelController.js
	ginco-admin/src/main/webapp/app/view/ThesaurusTabPanel.js
	sql/postgresql92/schema-2.0.sql
Merge branch 'master' of github.com:culturecommunication/ginco