IDEX-1125
Merge branch 'master' of github.com:codenvy/platform-api