Chande db name for test config
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/eu/factorx/citizens/service/impl/CalculationServiceImpl.java
Chande db name for test config