PyCharm 4.0.1 <riad@riad-osx1.local Update other.xml, project.default.xml, editor.codeinsight.xml, filetypes.xml, ide.general.xml, RiaD_local.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/editor.codeinsight.xml
	$APP_CONFIG$/filetypes.xml
	$APP_CONFIG$/ide.general.xml
	$APP_CONFIG$/project.default.xml