Merge remote-tracking branch 'origin/master'

author Dmitry Batkovich <dmitry.batkovich@jetbrains.com>

Mon, 17 Oct 2016 16:14:28 +0000 (19:14 +0300)

committer Dmitry Batkovich <dmitry.batkovich@jetbrains.com>

Mon, 17 Oct 2016 16:14:28 +0000 (19:14 +0300)
author Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 17 Oct 2016 16:14:28 +0000 (19:14 +0300)
committer Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 17 Oct 2016 16:14:28 +0000 (19:14 +0300)
diff --cc build/scripts/layouts.gant
Simple merge
diff --cc platform/util/resources/misc/registry.properties
Simple merge
diff --cc resources/src/META-INF/IdeaPlugin.xml
Simple merge
author	Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
	Mon, 17 Oct 2016 16:14:28 +0000 (19:14 +0300)
committer	Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
	Mon, 17 Oct 2016 16:14:28 +0000 (19:14 +0300)
		1	2
build/scripts/layouts.gant	patch \|	diff1 \|	diff2 \|	blob \| history
platform/util/resources/misc/registry.properties	patch \|	diff1 \|	diff2 \|	blob \| history
resources/src/META-INF/IdeaPlugin.xml	patch \|	diff1 \|	diff2 \|	blob \| history