UST45 Implementation of Complex Concepts (No unit test for now...)
Merge branch 'US45'

Conflicts:
	ginco-admin/src/main/resources/labels.properties
	ginco-impl/src/main/resources/spring/applicationContext-daos.xml
	sql/postgresql92/schema-1.6.sql