include new JSON in build; remove old JSON file type

build/scripts/layouts.gant

@@ -76,6 +76,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "java-impl",
     "java-psi-impl",
     "java-structure-view",
+    "json",
     "jsp-spi",
     "manifest",
     "platform-main",

json/src/com/intellij/json/JsonFileType.java

@@ -27,7 +27,7 @@ public class JsonFileType extends LanguageFileType{
   @NotNull
   @Override
   public String getDescription() {
-    return "JSON language";
+    return "JSON files";
   }
 
   @NotNull

python/src/META-INF/pycharm-core.xml

@@ -12,6 +12,7 @@
   <xi:include href="/META-INF/RemoteServers.xml" xpointer="xpointer(/idea-plugin/*)">
     <xi:fallback/>
   </xi:include>
+  <xi:include href="/META-INF/JsonPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <application-components>
     <component>