API: docker ps -a support
Merge branch 'docker' of github.com:citadel/citadel into docker