Revert "Works with test UI"

This reverts commit c87d9118a4c10bf151596798ee65300b6ae9cc34.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/config/application.yml
	src/test/resources/config/application.yml