Merge branch 'master' of https://github.com/SurfTV/docker-base-jvm
Merge branch 'master' of https://github.com/SurfTV/docker-base-jvm

Conflicts:
	Dockerfile