database: tables converted to singletons
database: columns & constraints updated to be referenced by instance
database: caption getter added in table gateways
Merge branch 'master' - conflict resolution

Conflicts:
	cms/components/listing.class.php
	cms/dblayer/tables/navigation.class.php
	cms/dblayer/tables/usertypecontrollerpermissions.class.php
	core/route.class.php
	core/router.class.php
	database/tablegateway.class.php