From 7da8b01b0d26688a10ee1de82c1c7c95cad71407 Mon Sep 17 00:00:00 2001
From: Phil Goodwin <pair+phil@pivotallabs.com>
Date: Fri, 22 Mar 2013 10:07:25 -0700
Subject: [PATCH] Reimported from pom.xml. Saved as many settings as we could.

---
 .idea/.name                                   |   2 +-
 .idea/compiler.xml                            |   2 -
 .idea/encodings.xml                           |   1 -
 .../libraries/Android_2_1_Google_API_libs.xml |  12 --
 .../Android_2_3_3_Google_API_libs.xml         |  12 --
 .../Android_4_1_2_Google_APIs_libs.xml        |  10 --
 ...en__com_google_android_maps_maps_16_r2.xml |  13 --
 .../Maven__com_h2database_h2_1_2_147.xml      |  13 --
 .../Maven__com_intellij_annotations_12_0.xml  |  13 --
 .../Maven__junit_junit_dep_4_8_2.xml          |  13 --
 ...Maven__org_easytesting_fest_util_1_2_3.xml |  13 --
 .../Maven__org_objenesis_objenesis_1_3.xml    |  13 --
 .idea/libraries/Production_Libs.xml           |  24 ----
 .idea/libraries/Robolectric_main_libs.xml     |  10 --
 .idea/libraries/Robolectric_test_libs.xml     |  10 --
 .idea/libraries/Test_libs.xml                 |  12 --
 .idea/libraries/android_support_v4.xml        |   9 --
 .idea/misc.xml                                | 125 +-----------------
 .idea/modules.xml                             |   1 -
 ..._Matchers_by_Regenerating_Expect_java_.xml |  24 ----
 .../Robolectric_Unit_Tests.xml                |  27 ----
 .idea/runConfigurations/StarterApp.xml        |   2 +-
 .idea/vcs.xml                                 |   5 -
 AndroidIntelliJStarter.iml                    |   5 +-
 Robolectric.iml                               |  18 ---
 pom.xml                                       |   2 +
 26 files changed, 8 insertions(+), 383 deletions(-)
 delete mode 100644 .idea/libraries/Android_2_1_Google_API_libs.xml
 delete mode 100644 .idea/libraries/Android_2_3_3_Google_API_libs.xml
 delete mode 100644 .idea/libraries/Android_4_1_2_Google_APIs_libs.xml
 delete mode 100644 .idea/libraries/Maven__com_google_android_maps_maps_16_r2.xml
 delete mode 100644 .idea/libraries/Maven__com_h2database_h2_1_2_147.xml
 delete mode 100644 .idea/libraries/Maven__com_intellij_annotations_12_0.xml
 delete mode 100644 .idea/libraries/Maven__junit_junit_dep_4_8_2.xml
 delete mode 100644 .idea/libraries/Maven__org_easytesting_fest_util_1_2_3.xml
 delete mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_1_3.xml
 delete mode 100644 .idea/libraries/Production_Libs.xml
 delete mode 100644 .idea/libraries/Robolectric_main_libs.xml
 delete mode 100644 .idea/libraries/Robolectric_test_libs.xml
 delete mode 100644 .idea/libraries/Test_libs.xml
 delete mode 100644 .idea/libraries/android_support_v4.xml
 delete mode 100644 .idea/runConfigurations/Add_custom_great_expectation_Matchers_by_Regenerating_Expect_java_.xml
 delete mode 100644 .idea/runConfigurations/Robolectric_Unit_Tests.xml
 delete mode 100644 Robolectric.iml

diff --git a/.idea/.name b/.idea/.name
index 7552c9d..83ac0e6 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-AndroidIntelliJStarter
\ No newline at end of file
+androidintellijstarter
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index a30fa74..5de8863 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -29,12 +29,10 @@
         <outputRelativeToContentRoot value="true" />
         <processorPath useClasspath="true" />
         <module name="androidintellijstarter" />
-        <module name="robolectric" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="androidintellijstarter" target="1.6" />
-      <module name="robolectric" target="1.6" />
     </bytecodeTargetLevel>
   </component>
 </project>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 95f3eef..74c0d0a 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/../robolectric" charset="UTF-8" />
   </component>
 </project>
 
diff --git a/.idea/libraries/Android_2_1_Google_API_libs.xml b/.idea/libraries/Android_2_1_Google_API_libs.xml
deleted file mode 100644
index e535f73..0000000
--- a/.idea/libraries/Android_2_1_Google_API_libs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Android 2.1 Google API libs">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/android-sdk-macosx/platforms/android-7/android.jar!/" />
-      <root url="jar://$USER_HOME$/android-sdk-macosx/add-ons/addon-google_apis-google-7/libs/maps.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/libs-src/android-src/7/sources.zip!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Android_2_3_3_Google_API_libs.xml b/.idea/libraries/Android_2_3_3_Google_API_libs.xml
deleted file mode 100644
index 1ef3604..0000000
--- a/.idea/libraries/Android_2_3_3_Google_API_libs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Android 2.3.3 Google API libs">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/android-sdk-macosx/platforms/android-10/android.jar!/" />
-      <root url="jar://$USER_HOME$/android-sdk-macosx/add-ons/addon-google_apis-google-10/libs/maps.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/libs-src/android-src/10/sources.zip!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Android_4_1_2_Google_APIs_libs.xml b/.idea/libraries/Android_4_1_2_Google_APIs_libs.xml
deleted file mode 100644
index f37f71a..0000000
--- a/.idea/libraries/Android_4_1_2_Google_APIs_libs.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Android 4.1.2 Google APIs libs">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/android-sdk-macosx/platforms/android-16/android.jar!/" />
-      <root url="jar://$USER_HOME$/android-sdk-macosx/add-ons/addon-google_apis-google-16/libs/maps.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_android_maps_maps_16_r2.xml b/.idea/libraries/Maven__com_google_android_maps_maps_16_r2.xml
deleted file mode 100644
index 999dddf..0000000
--- a/.idea/libraries/Maven__com_google_android_maps_maps_16_r2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.google.android.maps:maps:16_r2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/google/android/maps/maps/16_r2/maps-16_r2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/google/android/maps/maps/16_r2/maps-16_r2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/google/android/maps/maps/16_r2/maps-16_r2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_h2database_h2_1_2_147.xml b/.idea/libraries/Maven__com_h2database_h2_1_2_147.xml
deleted file mode 100644
index 9fd6cd7..0000000
--- a/.idea/libraries/Maven__com_h2database_h2_1_2_147.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.h2database:h2:1.2.147">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.2.147/h2-1.2.147.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.2.147/h2-1.2.147-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.2.147/h2-1.2.147-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_intellij_annotations_12_0.xml b/.idea/libraries/Maven__com_intellij_annotations_12_0.xml
deleted file mode 100644
index a5eed72..0000000
--- a/.idea/libraries/Maven__com_intellij_annotations_12_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.intellij:annotations:12.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/intellij/annotations/12.0/annotations-12.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/intellij/annotations/12.0/annotations-12.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/intellij/annotations/12.0/annotations-12.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_dep_4_8_2.xml b/.idea/libraries/Maven__junit_junit_dep_4_8_2.xml
deleted file mode 100644
index 63e86a8..0000000
--- a/.idea/libraries/Maven__junit_junit_dep_4_8_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit-dep:4.8.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit-dep/4.8.2/junit-dep-4.8.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit-dep/4.8.2/junit-dep-4.8.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit-dep/4.8.2/junit-dep-4.8.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_easytesting_fest_util_1_2_3.xml b/.idea/libraries/Maven__org_easytesting_fest_util_1_2_3.xml
deleted file mode 100644
index 33a9b00..0000000
--- a/.idea/libraries/Maven__org_easytesting_fest_util_1_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.easytesting:fest-util:1.2.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-util/1.2.3/fest-util-1.2.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-util/1.2.3/fest-util-1.2.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-util/1.2.3/fest-util-1.2.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_3.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_3.xml
deleted file mode 100644
index 7f5114b..0000000
--- a/.idea/libraries/Maven__org_objenesis_objenesis_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.objenesis:objenesis:1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.3/objenesis-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.3/objenesis-1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.3/objenesis-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Production_Libs.xml b/.idea/libraries/Production_Libs.xml
deleted file mode 100644
index e1a8641..0000000
--- a/.idea/libraries/Production_Libs.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="libraryTable">
-  <library name="Production Libs">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/libs" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/libs-src/guava-src-r09.zip!/" />
-      <root url="jar://$PROJECT_DIR$/libs-src/jackson-src-1.8.4-min.zip!/jackson-src-1.8.4/src/smile/java" />
-      <root url="jar://$PROJECT_DIR$/libs-src/jackson-src-1.8.4-min.zip!/jackson-src-1.8.4/src/sample" />
-      <root url="jar://$PROJECT_DIR$/libs-src/jackson-src-1.8.4-min.zip!/jackson-src-1.8.4/src/xc/java" />
-      <root url="jar://$PROJECT_DIR$/libs-src/jackson-src-1.8.4-min.zip!/jackson-src-1.8.4/src/jaxrs/java" />
-      <root url="jar://$PROJECT_DIR$/libs-src/jackson-src-1.8.4-min.zip!/jackson-src-1.8.4/src/java" />
-      <root url="jar://$PROJECT_DIR$/libs-src/jackson-src-1.8.4-min.zip!/jackson-src-1.8.4/src/mrbean/java" />
-      <root url="jar://$PROJECT_DIR$/libs-src/jackson-src-1.8.4-min.zip!/jackson-src-1.8.4/src/perf" />
-      <root url="jar://$PROJECT_DIR$/libs-src/jackson-src-1.8.4-min.zip!/jackson-src-1.8.4/src/mapper/java" />
-      <root url="jar://$PROJECT_DIR$/libs-src/jackson-src-1.8.4-min.zip!/jackson-src-1.8.4/src/test" />
-      <root url="jar://$PROJECT_DIR$/libs-src/guice-3.0-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/libs-src/roboguice-2.0-sources.jar!/" />
-    </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/libs" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/libs/main" recursive="false" />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Robolectric_main_libs.xml b/.idea/libraries/Robolectric_main_libs.xml
deleted file mode 100644
index 5082408..0000000
--- a/.idea/libraries/Robolectric_main_libs.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Robolectric main libs">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/submodules/robolectric/lib/main" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/submodules/robolectric/lib/main" recursive="false" />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Robolectric_test_libs.xml b/.idea/libraries/Robolectric_test_libs.xml
deleted file mode 100644
index 3e94db8..0000000
--- a/.idea/libraries/Robolectric_test_libs.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Robolectric test libs">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/submodules/robolectric/lib/test" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/submodules/robolectric/lib/test" recursive="false" />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Test_libs.xml b/.idea/libraries/Test_libs.xml
deleted file mode 100644
index 2e0855d..0000000
--- a/.idea/libraries/Test_libs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Test libs">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/libs/test" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/libs/test/mockito-core-1.9.5.jar!/" />
-    </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/libs/test" recursive="true" />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/android_support_v4.xml b/.idea/libraries/android_support_v4.xml
deleted file mode 100644
index d491fd0..0000000
--- a/.idea/libraries/android_support_v4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="android-support-v4">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/android-sdk-macosx/extras/android/support/v4/android-support-v4.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7f4ea34..77eb7f1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -16,50 +16,6 @@
   <component name="ClearCaseSharedConfig">
     <option name="myUseUcmModel" value="true" />
   </component>
-  <component name="DaemonCodeAnalyzer">
-    <disable_hints />
-  </component>
-  <component name="DebuggerManager">
-    <breakpoint_any>
-      <breakpoint>
-        <option name="NOTIFY_CAUGHT" value="true" />
-        <option name="NOTIFY_UNCAUGHT" value="true" />
-        <option name="ENABLED" value="false" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="SUSPEND" value="true" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="true" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint>
-        <option name="NOTIFY_CAUGHT" value="true" />
-        <option name="NOTIFY_UNCAUGHT" value="true" />
-        <option name="ENABLED" value="false" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="SUSPEND" value="true" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="true" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-    </breakpoint_any>
-    <breakpoint_rules />
-    <ui_properties />
-  </component>
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="android" url="file://$PROJECT_DIR$" />
   </component>
@@ -85,7 +41,6 @@
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/../robolectric/pom.xml" />
       </list>
     </option>
   </component>
@@ -93,90 +48,12 @@
     <option name="LAST_EDITED_MODULE_NAME" />
     <option name="LAST_EDITED_TAB_NAME" />
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectReloadState">
-    <option name="STATE" value="0" />
-  </component>
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/classes" />
-  </component>
-  <component name="RunManager">
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <list size="0" />
-    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
-      <Host>localhost</Host>
-      <Port>5050</Port>
-    </configuration>
+    <output url="file://$PROJECT_DIR$/out" />
   </component>
-  <component name="ShelveChangesManager" show_recycled="false" />
   <component name="SvnConfiguration" maxAnnotateRevisions="500">
     <option name="USER" value="" />
     <option name="PASSWORD" value="" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index e78c1bb..f5a5edd 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/androidintellijstarter.iml" filepath="$PROJECT_DIR$/androidintellijstarter.iml" />
-      <module fileurl="file://$PROJECT_DIR$/../robolectric/robolectric.iml" filepath="$PROJECT_DIR$/../robolectric/robolectric.iml" />
     </modules>
   </component>
 </project>
diff --git a/.idea/runConfigurations/Add_custom_great_expectation_Matchers_by_Regenerating_Expect_java_.xml b/.idea/runConfigurations/Add_custom_great_expectation_Matchers_by_Regenerating_Expect_java_.xml
deleted file mode 100644
index a739d92..0000000
--- a/.idea/runConfigurations/Add_custom_great_expectation_Matchers_by_Regenerating_Expect_java_.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Add custom great-expectation Matchers by Regenerating Expect.java " type="Application" factoryName="Application">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="com.example.android.sampleapp.test.support.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <option name="MAIN_CLASS_NAME" value="com.example.android.sampleapp.test.support.GenerateExpect" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="AndroidIntelliJStarter" />
-    <envs />
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Robolectric_Unit_Tests.xml b/.idea/runConfigurations/Robolectric_Unit_Tests.xml
deleted file mode 100644
index 4e9192a..0000000
--- a/.idea/runConfigurations/Robolectric_Unit_Tests.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Robolectric Unit Tests" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <module name="Robolectric" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.robolectric" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$/submodules/robolectric" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs>
-      <env name="ANDROID_HOME" value="$USER_HOME$/android-sdk-macosx" />
-    </envs>
-    <patterns />
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/StarterApp.xml b/.idea/runConfigurations/StarterApp.xml
index 8535320..46c86fb 100644
--- a/.idea/runConfigurations/StarterApp.xml
+++ b/.idea/runConfigurations/StarterApp.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="StarterApp" type="AndroidRunConfigurationType" factoryName="Android Application">
-    <module name="AndroidIntelliJStarter" />
+    <module name="androidintellijstarter" />
     <option name="ACTIVITY_CLASS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="DEPLOY" value="true" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 1c4e681..275077f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ClearCaseSharedConfig">
-    <option name="myUseUcmModel" value="true" />
-  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/submodules/robolectric" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/../robolectric" vcs="Git" />
   </component>
 </project>
 
diff --git a/AndroidIntelliJStarter.iml b/AndroidIntelliJStarter.iml
index 76db09f..18b8b4c 100644
--- a/AndroidIntelliJStarter.iml
+++ b/AndroidIntelliJStarter.iml
@@ -41,6 +41,7 @@
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
+      <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
       <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
@@ -60,7 +61,8 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.httpcomponents:httpclient:4.0.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.squareup:fest-android:1.0.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.easytesting:fest-assert-core:2.0M9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.easytesting:fest-util:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.easytesting:fest-util:1.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.easytesting:fest-reflect:1.4" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
@@ -75,7 +77,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-util:4.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-analysis:4.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.android:support-v4:r7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.easytesting:fest-reflect:1.4" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-ant-tasks:2.1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.8.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.8.0" level="project" />
diff --git a/Robolectric.iml b/Robolectric.iml
deleted file mode 100644
index 19741f3..0000000
--- a/Robolectric.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/submodules/robolectric">
-      <sourceFolder url="file://$MODULE_DIR$/submodules/robolectric/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/submodules/robolectric/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/submodules/robolectric/out" />
-    </content>
-    <orderEntry type="library" name="Robolectric main libs" level="project" />
-    <orderEntry type="library" scope="TEST" name="Robolectric test libs" level="project" />
-    <orderEntry type="library" name="Android 4.1.2 Google APIs libs" level="project" />
-    <orderEntry type="library" name="android-support-v4" level="project" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="jdk" jdkName="Android 4.1.2 Google APIs" jdkType="Android SDK" />
-  </component>
-</module>
-
diff --git a/pom.xml b/pom.xml
index 914cb35..b86f7ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,7 @@
       <groupId>org.easytesting</groupId>
       <artifactId>fest-reflect</artifactId>
       <version>1.4</version>
+      <scope>test</test>
     </dependency>
 
     <dependency>
@@ -149,6 +150,7 @@
       <groupId>javax.annotation</groupId>
       <artifactId>jsr250-api</artifactId>
       <version>1.0</version>
+      <scope>test</scope>
     </dependency>
 
     <!--android & robolectric-->