Update editor.codeinsight.xml, plugin_ui.xml
Update other.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/plugin_ui.xml