IntelliJ IDEA (Cassiopeia) IU-140.1185 <develar@develar-air.local Update filetypes.xml
IntelliJ IDEA (Cassiopeia) IU-140.1185 <develar@develar-air.local Update usageView.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/usageView.xml