Merge branch 'master' of github.com:codenvy/ide
IDEX-723 move java code assistant to separate war
Merge remote-tracking branch 'origin/master'