Support for env selection based on env_var called XDOCKER_ENV
Merge branch 'master' of github.com:XDocker/app