IntelliJ IDEA (Cassiopeia) IU-140.1021 <develar@develar-work.labs.intellij.net Update other.xml, project.default.xml, Default.xml, filetypes.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/filetypes.xml