Merge branch 'master' of https://github.com/dotcloud/docker into 3056-bindcontext

Conflicts:
	builder/internals.go
	integration-cli/docker_cli_build_test.go
fixed coding style (gofmt)

Docker-DCO-1.1-Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr> (github: a-ba)