Merge remote-tracking branch 'origin/develop' into wibesa

Conflicts:
	src/test/resources/database_seed.xml
Merge remote-tracking branch 'origin/wibesa' into wibesa
changed multi value id in missing seeds