Create other.xml, ui.lnf.xml, web-browsers.xml, colors.scheme.xml, databaseDrivers.xml, Default.xml, Ruby_Rails.xml, path.macros.xml, keymap.xml, duplocatorSettings.xml, ide.general.xml, notifications.xml, project.default.xml, webServers.xml, template.settings.xml, filetypes.xml, Deployment.xml, code.style.schemes.xml, plugin_ui.xml
Create path.macros.xml, options.xml, laf.xml	Delete Default.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/options.xml