Resync
Merge branch 'master' of https://github.com/Bwooce/docker

Conflicts:
	api/client/commands.go