[V2S1 US33] Added uri check for custom attributs
Merge branch 'V2S1_US33'

Conflicts:
	ginco-admin/src/main/webapp/app/view/ConceptPanel.js
	ginco-admin/src/main/webapp/ext-custom-comp.js