Merge branch 'master' of http://git.lschulz.one:3000/leo/inwo_vgl

# Conflicts:
#	src/main/resources/application.properties