Update other.xml, riad_osx_keymap.xml, plugin_ui.xml, ide.general.xml
Update other.xml, packages.xml, ide.general.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/ide.general.xml