code clean up
Merge branch 'master' of github.com:codenvy/ide
Merge branch 'master' of github.com:codenvy/ide