Merge branch 'master' into mikhail.golubev/json-preview

Conflicts:
	community-main.iml

diff --cc community-main.iml
index 6d76dc43b6853730733f51ad274dcdf27c41dc92,a42803e931d21a012abb465ad8b2daf876419ddc..98b163ed9224a749e9c866fee2dbcbcc0a71d6ae
--- 1/community-main.iml
--- 2/community-main.iml
+++ b/community-main.iml
@@@ -105,8 -105,7 +105,9 @@@
      <orderEntry type="module" module-name="structuralsearch-java" />
      <orderEntry type="module" module-name="structuralsearch-tests" scope="TEST" />
      <orderEntry type="module" module-name="structuralsearch-groovy" />
 +    <orderEntry type="module" module-name="json" />
 +    <orderEntry type="module" module-name="json-tests" scope="TEST" />
+     <orderEntry type="module" module-name="typeMigration" />
    </component>
  </module>
  

diff --cc resources/src/idea/RichPlatformPlugin.xml
Simple merge