IntelliJ IDEA (Cassiopeia) IU-139.560.4 <riad@riad-osx1.local Update project.default.xml, filetypes.xml, ide.general.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/filetypes.xml
	$APP_CONFIG$/ide.general.xml