IDEX-1308
Merge branch 'master' of github.com:codenvy/ide