diff --git a/.idea/libraries/bouncy_castle.xml b/.idea/libraries/bouncy_castle.xml
deleted file mode 100644
index 4e4673aa939e..000000000000
--- a/.idea/libraries/bouncy_castle.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="bouncy-castle">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/bcpkix-jdk15on-1.48.jar!/" />
-      <root url="jar://$PROJECT_DIR$/android/android/lib/bcprov-jdk15on-1.48.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/builder_model.xml b/.idea/libraries/builder_model.xml
index 44969bd6dc24..fdfe1be268a6 100644
--- a/.idea/libraries/builder_model.xml
+++ b/.idea/libraries/builder_model.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="builder-model">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/builder-model-1.3.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/builder-model-1.4.0-beta2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/src/builder-model-1.3.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/src/builder-model-1.4.0-beta2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/http_client.xml b/.idea/libraries/http_client.xml
index 493a73de1a07..62128a51774c 100644
--- a/.idea/libraries/http_client.xml
+++ b/.idea/libraries/http_client.xml
@@ -11,13 +11,13 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.4.1-src.zip!/httpcomponents-core-4.4.1/httpcore/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.4.1-src.zip!/httpcomponents-core-4.4.1/httpcore/src/main/java-deprecated" />
       <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.4.1-src.zip!/httpcomponents-client-4.4.1/httpmime/src/main/java" />
       <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.4.1-src.zip!/httpcomponents-client-4.4.1/httpmime/src/main/java-deprecated" />
       <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.4.1-src.zip!/httpcomponents-client-4.4.1/fluent-hc/src/main/java" />
       <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.4.1-src.zip!/httpcomponents-client-4.4.1/httpclient/src/main/java" />
       <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.4.1-src.zip!/httpcomponents-client-4.4.1/httpclient/src/main/java-deprecated" />
-      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.4.1 -src.zip!/httpcomponents-core-4.3.3/httpcore/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.4.1-src.zip!/httpcomponents-core-4.3.3/httpcore/src/main/java-deprecated" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/javawriter.xml b/.idea/libraries/javawriter.xml
deleted file mode 100644
index 1d73b23855f5..000000000000
--- a/.idea/libraries/javawriter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="javawriter">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/javawriter-2.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/src/javawriter-2.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/junit_hamcrest.xml b/.idea/libraries/junit_hamcrest.xml
deleted file mode 100644
index dd6eb1cfec16..000000000000
--- a/.idea/libraries/junit_hamcrest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<component name="libraryTable">
-  <library name="junit-hamcrest">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-junit-2.0.0.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/java-hamcrest-2.0.0.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/junit-4.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-junit-2.0.0.0-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/java-hamcrest-2.0.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-junit-2.0.0.0-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/java-hamcrest-2.0.0.0-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/src/junit-4.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bd14749a55e5..77fc541298b1 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -165,7 +165,7 @@
       <module fileurl="file://$PROJECT_DIR$/java/manifest/manifest.iml" filepath="$PROJECT_DIR$/java/manifest/manifest.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/manifest-merger/manifest-merger.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/manifest-merger/manifest-merger.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven.iml" filepath="$PROJECT_DIR$/plugins/maven/maven.iml" group="plugins/maven" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m31/maven-artifact-resolver-m31.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m31/maven-artifact-resolver-m31.iml" group="plugins/maven" />
@@ -193,6 +193,7 @@
       <module fileurl="file://$PROJECT_DIR$/python/python-community.iml" filepath="$PROJECT_DIR$/python/python-community.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/build/python-community-build.iml" filepath="$PROJECT_DIR$/python/build/python-community-build.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/pluginSrc/python-community-plugin.iml" filepath="$PROJECT_DIR$/python/pluginSrc/python-community-plugin.iml" group="python" />
+      <module fileurl="file://$PROJECT_DIR$/python/python-community-plugin-resources.iml" filepath="$PROJECT_DIR$/python/python-community-plugin-resources.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/testSrc/python-community-tests.iml" filepath="$PROJECT_DIR$/python/testSrc/python-community-tests.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/edu/build/python-edu-build.iml" filepath="$PROJECT_DIR$/python/edu/build/python-edu-build.iml" group="python/educational" />
       <module fileurl="file://$PROJECT_DIR$/python/edu/python-educational.iml" filepath="$PROJECT_DIR$/python/edu/python-educational.iml" group="python/educational" />