[V1S6 US26] Implementation of parents for concept arrays
Merge branch 'US26'

Conflicts:
	ginco-admin/src/main/webapp/app.js
	sql/postgresql92/schema-1.6.sql
[V1S6 US26] Update SQL for unit tests