Fix localhost issues
Merge branch 'master' of github.com:dimakuzminov/incredibuild_deployment