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

Conflicts:
	db/pom.xml
	webapp/src/main/resources/config.properties