add color running containers
Merge remote-tracking branch 'origin/master'

Conflicts:
	api/client/pot.go