diff --git a/.idea/modules.xml b/.idea/modules.xml
index 994e776e194b2..b0f8c1ce4bddd 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/android/android.iml" filepath="$PROJECT_DIR$/android/android.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/client/client.iml" filepath="$PROJECT_DIR$/java/client/client.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ide.iml" filepath="$PROJECT_DIR$/ide.iml" />
       <module fileurl="file://$PROJECT_DIR$/javascript/javascript.iml" filepath="$PROJECT_DIR$/javascript/javascript.iml" />
       <module fileurl="file://$PROJECT_DIR$/py/python.iml" filepath="$PROJECT_DIR$/py/python.iml" />
       <module fileurl="file://$PROJECT_DIR$/rb/ruby.iml" filepath="$PROJECT_DIR$/rb/ruby.iml" />
diff --git a/android/android.iml b/android/android.iml
index b24688e05d0bc..fa1349a1a8feb 100644
--- a/android/android.iml
+++ b/android/android.iml
@@ -3,28 +3,9 @@
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
-        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
-        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
-        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/libs" />
-        <option name="REGENERATE_R_JAVA" value="true" />
-        <option name="REGENERATE_JAVA_BY_AIDL" value="true" />
-        <option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
-        <option name="CUSTOM_APK_RESOURCE_FOLDER" value="" />
-        <option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
-        <option name="CUSTOM_COMPILER_MANIFEST" value="" />
-        <option name="APK_PATH" value="" />
-        <option name="LIBRARY_PROJECT" value="false" />
-        <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
-        <option name="GENERATE_UNSIGNED_APK" value="false" />
-        <option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
-        <option name="PACK_TEST_CODE" value="false" />
-        <option name="RUN_PROGUARD" value="false" />
         <option name="PROGUARD_CFG_PATH" value="/proguard.cfg" />
-        <resOverlayFolders />
         <includeSystemProguardFile>false</includeSystemProguardFile>
+        <resOverlayFolders />
       </configuration>
     </facet>
   </component>
diff --git a/android/gen/org/openqa/selenium/android/app/R.java b/android/gen/org/openqa/selenium/android/app/R.java
index 60eb4286799ed..ccdc981968bb3 100644
--- a/android/gen/org/openqa/selenium/android/app/R.java
+++ b/android/gen/org/openqa/selenium/android/app/R.java
@@ -1,43 +1,7 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
+/*___Generated_by_IDEA___*/
 
 package org.openqa.selenium.android.app;
 
+/* This stub is for using by IDE only. It is NOT the R class actually packed into APK */
 public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int alert_dialog_icon=0x7f020000;
-        public static final int ic_menu_add=0x7f020001;
-        public static final int ic_menu_delete=0x7f020002;
-        public static final int ic_menu_share=0x7f020003;
-        public static final int selenium_icon=0x7f020004;
-    }
-    public static final class id {
-        public static final int rssWebView=0x7f060002;
-        public static final int status=0x7f060000;
-        public static final int webview=0x7f060001;
-    }
-    public static final class layout {
-        public static final int single_session_layout=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f050009;
-        public static final int ctx_menu_navigate=0x7f050001;
-        public static final int default_session_status=0x7f050002;
-        public static final int httpd_already_started=0x7f050005;
-        public static final int httpd_not_running=0x7f050008;
-        public static final int httpd_not_started=0x7f050004;
-        public static final int httpd_not_stopped=0x7f050007;
-        public static final int httpd_started=0x7f050003;
-        public static final int httpd_stopped=0x7f050006;
-        public static final int main_title=0x7f050000;
-    }
-    public static final class xml {
-        public static final int preferences=0x7f040000;
-    }
-}
+}
\ No newline at end of file
diff --git a/ide/main/src/content/webdriver-backed-selenium.js b/ide/main/src/content/webdriver-backed-selenium.js
index 3188a623714a2..1181b2c841e38 100644
--- a/ide/main/src/content/webdriver-backed-selenium.js
+++ b/ide/main/src/content/webdriver-backed-selenium.js
@@ -95,6 +95,10 @@ function webdriverBackedSeleniumBuilder() {
 
   };
 
+	WebdriverBackedSelenium.prototype.doStore = function(value, varName) {
+	  storedVars[varName] = value;
+	};
+
   WebdriverBackedSelenium.prototype._elementLocator = function(sel1Locator) {
     var locator = parse_locator(sel1Locator);
     if (sel1Locator.match(/^\/\//) || locator.type == 'xpath') {