Fixed failing ONIX-PL tests
Merge branch 'newdev' of github.com:k-int/KBPlus into newdev

Conflicts:
	app/application.properties