docker cleanup
Merge remote-tracking branch 'origin/spring-boot' into spring-boot

Conflicts:
	Docker/Dockerfile
merged