* master: Merge `image` and `registry` packages together Conflicts: app/actions/application/deploy.go