WIP: still have two tests failing

Merge branch 'master' into robolectric-2-master

Conflicts:
	build.xml
	pom.xml
	src/main/java/com/xtremelabs/robolectric/res/DimenResourceLoader.java
	src/main/java/com/xtremelabs/robolectric/tester/android/util/TestAttributeSet.java
	src/main/java/org/robolectric/Robolectric.java
	src/main/java/org/robolectric/bytecode/ShadowWrangler.java
	src/main/java/org/robolectric/res/builder/RobolectricPackageManager.java
	src/main/java/org/robolectric/shadows/ShadowAlertDialog.java
	src/main/java/org/robolectric/shadows/ShadowAnimator.java
	src/main/java/org/robolectric/shadows/ShadowBluetoothAdapter.java
	src/main/java/org/robolectric/shadows/ShadowGestureDetector.java
	src/main/java/org/robolectric/shadows/ShadowLinearLayout.java
	src/main/java/org/robolectric/shadows/ShadowRelativeLayout.java
	src/main/java/org/robolectric/shadows/ShadowResources.java
	src/main/java/org/robolectric/shadows/ShadowSQLiteDatabase.java
	src/main/java/org/robolectric/shadows/ShadowValueAnimator.java
	src/main/java/org/robolectric/shadows/ShadowView.java
	src/main/java/org/robolectric/shadows/ShadowViewGroup.java
	src/main/java/org/robolectric/tester/android/content/TestSharedPreferences.java
	src/main/java/org/robolectric/tester/android/view/TestWindow.java
	src/test/java/com/xtremelabs/robolectric/InstrumentDetectorTest.java
	src/test/java/com/xtremelabs/robolectric/R.java
	src/test/java/com/xtremelabs/robolectric/res/DimenResourceLoaderTest.java
	src/test/java/com/xtremelabs/robolectric/shadows/BluetoothAdapterTest.java
	src/test/java/com/xtremelabs/robolectric/shadows/ResourcesTest.java
	src/test/java/com/xtremelabs/robolectric/shadows/ShadowTypefaceTest.java
	src/test/java/com/xtremelabs/robolectric/shadows/TypefaceTest.java
	src/test/java/org/robolectric/RobolectricTestRunnerClassLoaderSetup.java
	src/test/java/org/robolectric/res/RobolectricPackageManagerTest.java
	src/test/java/org/robolectric/res/ViewLoaderTest.java
	src/test/java/org/robolectric/shadows/AppWidgetManagerTest.java
	src/test/java/org/robolectric/shadows/BitmapDrawableTest.java
	src/test/java/org/robolectric/shadows/ContentResolverTest.java
	src/test/java/org/robolectric/shadows/GestureDetectorTest.java
	src/test/java/org/robolectric/shadows/LinearLayoutTest.java
	src/test/java/org/robolectric/shadows/LogTest.java
	src/test/java/org/robolectric/shadows/LooperTest.java
	src/test/java/org/robolectric/shadows/SQLiteDatabaseTest.java
	src/test/java/org/robolectric/shadows/ShadowTypefaceTest.java
	src/test/java/org/robolectric/shadows/SpannableStringBuilderTest.java
	src/test/java/org/robolectric/shadows/TextViewTest.java
	src/test/java/org/robolectric/shadows/ViewTest.java
	src/test/java/org/robolectric/tester/android/content/TestSharedPreferencesTest.java
Todos done.
Merge remote-tracking branch 'origin/robolectric-2-master' into robolectric-2-master-merge

Conflicts:
	src/main/java/org/robolectric/Robolectric.java
	src/main/java/org/robolectric/util/Scheduler.java
	src/test/java/org/robolectric/RobolectricTestRunnerClassLoaderSetupTest.java
	src/test/java/org/robolectric/shadows/DialogFragmentTest.java
Merge remote-tracking branch 'origin/robolectric-2-master-merge' into robolectric-2-master

* origin/robolectric-2-master-merge:
  Todos done.
  WIP: still have two tests failing

Conflicts:
	src/main/java/org/robolectric/Robolectric.java
	src/main/java/org/robolectric/bytecode/ShadowWrangler.java
	src/main/java/org/robolectric/shadows/ShadowDialogFragment.java
	src/main/java/org/robolectric/tester/android/util/TestFragmentManager.java
	src/test/java/org/robolectric/shadows/DialogFragmentTest.java
	src/test/java/org/robolectric/shadows/ViewTest.java