Update ide.general.xml
Update other.xml
Update filetypes.xml
Update project.default.xml, riad_osx_keymap.xml, filetypes.xml, ide.general.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/ide.general.xml
	$APP_CONFIG$/other.xml