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