https://github.com/kpelykh/docker-java/issues/31
Merge branch 'master' of https://github.com/marcuslinke/docker-java

Conflicts:
	src/main/java/com/kpelykh/docker/client/DockerClient.java