Starting container and running a command
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.sbt