yaml
Merge remote-tracking branch 'origin/spring-boot' into spring-boot

Conflicts:
	src/main/resources/application-docker.properties