PyCharm PY-139.673 <riad@77.88.17.47-red2.dhcp.yndx.net Update other.xml, packages.xml, ide.general.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/ide.general.xml
PyCharm PY-139.673 <riad@riad-osx1.local Update project.default.xml, filetypes.xml, ide.general.xml