Merge remote-tracking branch 'origin/master' into develar/is

author Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>

Mon, 25 Jul 2016 11:39:58 +0000 (13:39 +0200)

committer Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>

Mon, 25 Jul 2016 11:39:58 +0000 (13:39 +0200)
author Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 25 Jul 2016 11:39:58 +0000 (13:39 +0200)
committer Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 25 Jul 2016 11:39:58 +0000 (13:39 +0200)
diff --cc platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
Simple merge
diff --cc platform/util/resources/misc/registry.properties
Simple merge
author	Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
	Mon, 25 Jul 2016 11:39:58 +0000 (13:39 +0200)
committer	Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
	Mon, 25 Jul 2016 11:39:58 +0000 (13:39 +0200)
		1	2
platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java	patch \|	diff1 \|	diff2 \|	blob \| history
platform/util/resources/misc/registry.properties	patch \|	diff1 \|	diff2 \|	blob \| history