IntelliJ IDEA (Community Edition) IC-140.SNAPSHOT <jason@Jasons-MacBook-Pro.local Update other.xml, colors.scheme.xml, project.default.xml, path.macros.xml, filetypes.xml	Create MyDefault.icls, MyDarcula.icls
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/project.default.xml