More tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/impl/src/test/resources/META-INF/beans.xml
	web/data/hsqldb/hsqldb.lck
	web/data/hsqldb/hsqldb.properties
	web/pom.xml