Update project.default.xml	Create IntelliLang.xml
Update ide.general.xml	Create git.xml
Update other.xml, keymap.xml	Create Mac OS X copy.xml
Update other.xml, RiaD_local.xml
Update Mac OS X copy.xml, ide.general.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/ide.general.xml
	$ROOT_CONFIG$/keymaps/Mac OS X copy.xml
	_mac/$APP_CONFIG$/keymap.xml