IDEX-594,IDEX-595:
Merge branch 'master' of github.com:codenvy/platform-api