Startup commands
Merge branch 'master' of https://github.com/mrbraz/docker

Conflicts:
	java8/Dockerfile