Merge branch 'master'

Conflicts:
	$APP_CONFIG$/code.style.schemes.xml
	$APP_CONFIG$/colors.scheme.xml
	$APP_CONFIG$/editor.codeinsight.xml
	$APP_CONFIG$/editor.xml
	$APP_CONFIG$/filetypes.xml
	$APP_CONFIG$/ide.general.xml
	$APP_CONFIG$/notifications.xml
	$APP_CONFIG$/other.xml
	$APP_CONFIG$/project.default.xml
	$APP_CONFIG$/template.settings.xml
	$APP_CONFIG$/ui.lnf.xml
	$APP_CONFIG$/webServers.xml
	$ROOT_CONFIG$/codestyles/Default _1_.xml
	$ROOT_CONFIG$/inspection/Default.xml
	_mac/$APP_CONFIG$/keymap.xml