IDEX-723 separate java codeassistant to jar and war
Merge remote-tracking branch 'origin/master'