diff --git a/actionbarsherlock/.gitignore b/actionbarsherlock/.gitignore
index a02fbbe0a..021b4205f 100644
--- a/actionbarsherlock/.gitignore
+++ b/actionbarsherlock/.gitignore
@@ -1,2 +1,2 @@
-/gen
-/bin
+gen
+bin
diff --git a/actionbarsherlock/bin/classes/android/support/v4/app/Watson$OnCreateOptionsMenuListener.class b/actionbarsherlock/bin/classes/android/support/v4/app/Watson$OnCreateOptionsMenuListener.class
deleted file mode 100644
index e45c65320..000000000
Binary files a/actionbarsherlock/bin/classes/android/support/v4/app/Watson$OnCreateOptionsMenuListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/android/support/v4/app/Watson$OnOptionsItemSelectedListener.class b/actionbarsherlock/bin/classes/android/support/v4/app/Watson$OnOptionsItemSelectedListener.class
deleted file mode 100644
index ae9f472c6..000000000
Binary files a/actionbarsherlock/bin/classes/android/support/v4/app/Watson$OnOptionsItemSelectedListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/android/support/v4/app/Watson$OnPrepareOptionsMenuListener.class b/actionbarsherlock/bin/classes/android/support/v4/app/Watson$OnPrepareOptionsMenuListener.class
deleted file mode 100644
index 874329589..000000000
Binary files a/actionbarsherlock/bin/classes/android/support/v4/app/Watson$OnPrepareOptionsMenuListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/android/support/v4/app/Watson.class b/actionbarsherlock/bin/classes/android/support/v4/app/Watson.class
deleted file mode 100644
index c645759c8..000000000
Binary files a/actionbarsherlock/bin/classes/android/support/v4/app/Watson.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$Implementation.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$Implementation.class
deleted file mode 100644
index 07a0de983..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$Implementation.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnActionModeFinishedListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnActionModeFinishedListener.class
deleted file mode 100644
index ba2cfcab5..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnActionModeFinishedListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnActionModeStartedListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnActionModeStartedListener.class
deleted file mode 100644
index 3ccc3b168..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnActionModeStartedListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnCreateOptionsMenuListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnCreateOptionsMenuListener.class
deleted file mode 100644
index d0ffc34a9..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnCreateOptionsMenuListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnCreatePanelMenuListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnCreatePanelMenuListener.class
deleted file mode 100644
index 7bf337c5b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnCreatePanelMenuListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnMenuItemSelectedListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnMenuItemSelectedListener.class
deleted file mode 100644
index 03609bbbd..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnMenuItemSelectedListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnOptionsItemSelectedListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnOptionsItemSelectedListener.class
deleted file mode 100644
index 4076b48e1..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnOptionsItemSelectedListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnPrepareOptionsMenuListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnPrepareOptionsMenuListener.class
deleted file mode 100644
index b9704c8e1..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnPrepareOptionsMenuListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnPreparePanelListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnPreparePanelListener.class
deleted file mode 100644
index 4e0224284..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock$OnPreparePanelListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock.class
deleted file mode 100644
index 759da883d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/ActionBarSherlock.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/BuildConfig.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/BuildConfig.class
deleted file mode 100644
index f3ea991b5..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/BuildConfig.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$attr.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$attr.class
deleted file mode 100644
index 7914ffec7..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$attr.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$bool.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$bool.class
deleted file mode 100644
index 029a3a287..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$bool.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$color.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$color.class
deleted file mode 100644
index 253c1dc6b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$color.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$dimen.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$dimen.class
deleted file mode 100644
index 8a39c6bc4..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$dimen.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$drawable.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$drawable.class
deleted file mode 100644
index e7798150d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$drawable.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$id.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$id.class
deleted file mode 100644
index 76f4ec628..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$id.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$integer.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$integer.class
deleted file mode 100644
index c3a4663d9..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$integer.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$layout.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$layout.class
deleted file mode 100644
index fd9f00ffa..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$layout.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$string.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$string.class
deleted file mode 100644
index a74e466d7..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$string.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$style.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$style.class
deleted file mode 100644
index 59f85aba7..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$style.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$styleable.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$styleable.class
index 03d61930a..cfe1bf33a 100644
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R$styleable.class and b/actionbarsherlock/bin/classes/com/actionbarsherlock/R$styleable.class differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/R.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/R.class
deleted file mode 100644
index a9c24203f..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/R.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$LayoutParams.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$LayoutParams.class
deleted file mode 100644
index 426e06d07..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$LayoutParams.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$OnMenuVisibilityListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$OnMenuVisibilityListener.class
deleted file mode 100644
index 377c6cbd3..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$OnMenuVisibilityListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$OnNavigationListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$OnNavigationListener.class
deleted file mode 100644
index e7631ef10..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$OnNavigationListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$Tab.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$Tab.class
deleted file mode 100644
index 09765f673..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$Tab.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$TabListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$TabListener.class
deleted file mode 100644
index d3c828029..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar$TabListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar.class
deleted file mode 100644
index a09ce5297..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/ActionBar.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockActivity.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockActivity.class
deleted file mode 100644
index 39b0e91aa..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockActivity.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockDialogFragment.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockDialogFragment.class
deleted file mode 100644
index 3b71e9dd5..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockDialogFragment.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockExpandableListActivity.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockExpandableListActivity.class
deleted file mode 100644
index 131741c31..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockExpandableListActivity.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockFragment.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockFragment.class
deleted file mode 100644
index c79b3589c..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockFragment.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockFragmentActivity.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockFragmentActivity.class
deleted file mode 100644
index fa8e1b4db..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockFragmentActivity.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockListActivity.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockListActivity.class
deleted file mode 100644
index 127786b89..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockListActivity.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockListFragment.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockListFragment.class
deleted file mode 100644
index 5b22c9523..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockListFragment.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockPreferenceActivity.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockPreferenceActivity.class
deleted file mode 100644
index 297237b71..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/app/SherlockPreferenceActivity.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockCompat$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockCompat$1.class
deleted file mode 100644
index 09bb5e811..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockCompat$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockCompat$ActionModeCallbackWrapper.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockCompat$ActionModeCallbackWrapper.class
deleted file mode 100644
index df75dad9f..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockCompat$ActionModeCallbackWrapper.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockCompat.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockCompat.class
deleted file mode 100644
index 90e4564d5..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockCompat.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockNative$ActionModeCallbackWrapper.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockNative$ActionModeCallbackWrapper.class
deleted file mode 100644
index 8f4d16cd9..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockNative$ActionModeCallbackWrapper.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockNative$ActionModeWrapper.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockNative$ActionModeWrapper.class
deleted file mode 100644
index b511794b9..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockNative$ActionModeWrapper.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockNative.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockNative.class
deleted file mode 100644
index 82dbd08d4..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockNative.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ResourcesCompat.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ResourcesCompat.class
deleted file mode 100644
index 430672e5d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/ResourcesCompat.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$1.class
deleted file mode 100644
index 2869fb12b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$2.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$2.class
deleted file mode 100644
index ceab0c41f..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$2.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$ActionModeImpl.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$ActionModeImpl.class
deleted file mode 100644
index 2ca8a8225..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$ActionModeImpl.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$TabImpl.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$TabImpl.class
deleted file mode 100644
index 5c206ed21..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$TabImpl.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl.class
deleted file mode 100644
index 2dd853b21..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarWrapper$TabWrapper.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarWrapper$TabWrapper.class
deleted file mode 100644
index adde78ffe..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarWrapper$TabWrapper.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarWrapper.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarWrapper.class
deleted file mode 100644
index 2cecc86fa..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/app/ActionBarWrapper.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Animator$AnimatorListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Animator$AnimatorListener.class
deleted file mode 100644
index e47ad311c..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Animator$AnimatorListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.class
deleted file mode 100644
index 281a4520b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.class
deleted file mode 100644
index ae4b86578..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$1.class
deleted file mode 100644
index aaedb90e0..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$AnimatorSetListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$AnimatorSetListener.class
deleted file mode 100644
index d144adcbd..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$AnimatorSetListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$Builder.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$Builder.class
deleted file mode 100644
index 5cbbc681b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$Builder.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$Dependency.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$Dependency.class
deleted file mode 100644
index 5e0764068..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$Dependency.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$DependencyListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$DependencyListener.class
deleted file mode 100644
index 9f09b6755..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$DependencyListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$Node.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$Node.class
deleted file mode 100644
index f94b2b61a..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$Node.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.class
deleted file mode 100644
index ee7b78ad0..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.class
deleted file mode 100644
index 2d950bc39..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.class
deleted file mode 100644
index b3f70f87b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.class
deleted file mode 100644
index 515af5da8..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.class
deleted file mode 100644
index 86bf0f673..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe$FloatKeyframe.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe$FloatKeyframe.class
deleted file mode 100644
index 56d147a79..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe$FloatKeyframe.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe$IntKeyframe.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe$IntKeyframe.class
deleted file mode 100644
index aa36b75af..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe$IntKeyframe.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe$ObjectKeyframe.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe$ObjectKeyframe.class
deleted file mode 100644
index 699951468..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe$ObjectKeyframe.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.class
deleted file mode 100644
index 168f790dd..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.class
deleted file mode 100644
index 9826ee0f6..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.class
deleted file mode 100644
index 0cc4d1116..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder$FloatPropertyValuesHolder.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder$FloatPropertyValuesHolder.class
deleted file mode 100644
index 29c498d73..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder$FloatPropertyValuesHolder.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder$IntPropertyValuesHolder.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder$IntPropertyValuesHolder.class
deleted file mode 100644
index b84423e33..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder$IntPropertyValuesHolder.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.class
deleted file mode 100644
index 28a835595..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.class
deleted file mode 100644
index 6b090a675..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$1.class
deleted file mode 100644
index 6f04d6bcd..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$2.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$2.class
deleted file mode 100644
index c38e111f6..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$2.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$3.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$3.class
deleted file mode 100644
index 90b41d760..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$3.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$4.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$4.class
deleted file mode 100644
index fea2a5871..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$4.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$5.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$5.class
deleted file mode 100644
index 7fad8e7f2..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$5.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$AnimationHandler.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$AnimationHandler.class
deleted file mode 100644
index 4d05eaf2b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$AnimationHandler.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$AnimatorUpdateListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$AnimatorUpdateListener.class
deleted file mode 100644
index b5bcde231..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator$AnimatorUpdateListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.class
deleted file mode 100644
index e6cbe1408..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.class
deleted file mode 100644
index 351e92083..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.class
deleted file mode 100644
index f7501a7c3..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.class
deleted file mode 100644
index 48bf9b453..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.class
deleted file mode 100644
index 2b0155895..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.class
deleted file mode 100644
index 1efa324eb..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/ActionProviderWrapper.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/ActionProviderWrapper.class
deleted file mode 100644
index c7111d036..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/ActionProviderWrapper.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/StandaloneActionMode.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/StandaloneActionMode.class
deleted file mode 100644
index 546d29f80..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/StandaloneActionMode.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.class
deleted file mode 100644
index 64f7c21b8..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.class
deleted file mode 100644
index a0db78b2b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenu.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenu.class
deleted file mode 100644
index 7f96b6ac7..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenu.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuItem.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuItem.class
deleted file mode 100644
index 1b120bf76..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuItem.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.class
deleted file mode 100644
index 7ea428936..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$ActionButtonSubmenu.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$ActionButtonSubmenu.class
deleted file mode 100644
index dc758eea7..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$ActionButtonSubmenu.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$HasPermanentMenuKey.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$HasPermanentMenuKey.class
deleted file mode 100644
index 3417adf27..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$HasPermanentMenuKey.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OpenOverflowRunnable.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OpenOverflowRunnable.class
deleted file mode 100644
index aaa0bceb1..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OpenOverflowRunnable.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OverflowMenuButton.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OverflowMenuButton.class
deleted file mode 100644
index 170a997f1..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OverflowMenuButton.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OverflowPopup.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OverflowPopup.class
deleted file mode 100644
index 3617e9d4d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OverflowPopup.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$PopupPresenterCallback.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$PopupPresenterCallback.class
deleted file mode 100644
index 0719e43fe..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$PopupPresenterCallback.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$SavedState$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$SavedState$1.class
deleted file mode 100644
index be84c43da..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$SavedState$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$SavedState.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$SavedState.class
deleted file mode 100644
index 2942f8165..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$SavedState.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.class
deleted file mode 100644
index 02bd580cd..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuView$ActionMenuChildView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuView$ActionMenuChildView.class
deleted file mode 100644
index bd4e448ee..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuView$ActionMenuChildView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuView$LayoutParams.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuView$LayoutParams.class
index 7227f50d6..90aaae457 100644
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuView$LayoutParams.class and b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuView$LayoutParams.class differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuView.class
deleted file mode 100644
index b21973859..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.class
deleted file mode 100644
index 6e075bacf..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ListMenuItemView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ListMenuItemView.class
deleted file mode 100644
index a527848ba..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/ListMenuItemView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuBuilder$Callback.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuBuilder$Callback.class
deleted file mode 100644
index 48c1cb93d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuBuilder$Callback.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuBuilder$ItemInvoker.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuBuilder$ItemInvoker.class
deleted file mode 100644
index fd0e5d079..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuBuilder$ItemInvoker.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuBuilder.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuBuilder.class
deleted file mode 100644
index f7d32337b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuBuilder.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuItemImpl.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuItemImpl.class
deleted file mode 100644
index 74a3e5a34..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuItemImpl.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuItemWrapper$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuItemWrapper$1.class
deleted file mode 100644
index c15747ea2..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuItemWrapper$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.class
deleted file mode 100644
index 8455e4e7d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPopupHelper$ExpandedIndexObserver.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPopupHelper$ExpandedIndexObserver.class
deleted file mode 100644
index 2ce6f8c47..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPopupHelper$ExpandedIndexObserver.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPopupHelper$MenuAdapter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPopupHelper$MenuAdapter.class
deleted file mode 100644
index 4a6e4c9ac..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPopupHelper$MenuAdapter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.class
deleted file mode 100644
index a08d31002..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPresenter$Callback.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPresenter$Callback.class
deleted file mode 100644
index 15e9b40b5..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPresenter$Callback.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPresenter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPresenter.class
deleted file mode 100644
index c6ab90ed7..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPresenter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuView$ItemView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuView$ItemView.class
deleted file mode 100644
index 5f30df611..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuView$ItemView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuView.class
deleted file mode 100644
index fbf5f9a20..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuWrapper.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuWrapper.class
deleted file mode 100644
index 449cea72d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/MenuWrapper.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.class
deleted file mode 100644
index 89f28e6ac..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.class
deleted file mode 100644
index bda99e961..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/AbsActionBarView$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/AbsActionBarView$1.class
deleted file mode 100644
index 22b352b94..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/AbsActionBarView$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/AbsActionBarView$VisibilityAnimListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/AbsActionBarView$VisibilityAnimListener.class
deleted file mode 100644
index 7360e62de..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/AbsActionBarView$VisibilityAnimListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/AbsActionBarView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/AbsActionBarView.class
deleted file mode 100644
index 168a17749..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/AbsActionBarView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarContainer.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarContainer.class
deleted file mode 100644
index cdf787980..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarContainer.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarContextView$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarContextView$1.class
deleted file mode 100644
index b9e159002..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarContextView$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarContextView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarContextView.class
deleted file mode 100644
index 36b5815d5..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarContextView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$1.class
deleted file mode 100644
index a0c42b251..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$2.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$2.class
deleted file mode 100644
index 56e64da8b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$2.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$3.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$3.class
deleted file mode 100644
index 67d449c27..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$3.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$ExpandedActionViewMenuPresenter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$ExpandedActionViewMenuPresenter.class
deleted file mode 100644
index f82c07aaf..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$ExpandedActionViewMenuPresenter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$HomeView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$HomeView.class
deleted file mode 100644
index faef0c825..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$HomeView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$SavedState$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$SavedState$1.class
deleted file mode 100644
index f40f328b5..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$SavedState$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$SavedState.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$SavedState.class
deleted file mode 100644
index a0389b7f0..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView$SavedState.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView.class
deleted file mode 100644
index 2af4c79fd..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ActionBarView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/CapitalizingButton.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/CapitalizingButton.class
deleted file mode 100644
index 29079f215..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/CapitalizingButton.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/CapitalizingTextView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/CapitalizingTextView.class
deleted file mode 100644
index 5cc928bf4..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/CapitalizingTextView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.class
deleted file mode 100644
index 3aef1d4b6..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner$RecycleBin.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner$RecycleBin.class
deleted file mode 100644
index bce395681..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner$RecycleBin.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner$SavedState$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner$SavedState$1.class
deleted file mode 100644
index b7f5fd409..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner$SavedState$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner$SavedState.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner$SavedState.class
deleted file mode 100644
index b9db8aceb..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner$SavedState.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner.class
deleted file mode 100644
index 5cbfb7ab9..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAbsSpinner.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$AdapterContextMenuInfo.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$AdapterContextMenuInfo.class
deleted file mode 100644
index 70d41eb85..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$AdapterContextMenuInfo.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$AdapterDataSetObserver.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$AdapterDataSetObserver.class
deleted file mode 100644
index 23866e307..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$AdapterDataSetObserver.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$OnItemLongClickListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$OnItemLongClickListener.class
deleted file mode 100644
index de5845eca..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$OnItemLongClickListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$OnItemSelectedListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$OnItemSelectedListener.class
deleted file mode 100644
index aa2f85356..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$OnItemSelectedListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$SelectionNotifier.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$SelectionNotifier.class
deleted file mode 100644
index 9606a681d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView$SelectionNotifier.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView.class
deleted file mode 100644
index a99870a0d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsAdapterView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsColorDrawable.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsColorDrawable.class
deleted file mode 100644
index 4c89e7aca..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsColorDrawable.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsLinearLayout.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsLinearLayout.class
deleted file mode 100644
index a6981ad74..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsLinearLayout.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$1.class
deleted file mode 100644
index cbbf414bf..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$DropDownListView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$DropDownListView.class
deleted file mode 100644
index a8d481826..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$DropDownListView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$ListSelectorHider.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$ListSelectorHider.class
deleted file mode 100644
index 69e450ae2..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$ListSelectorHider.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$PopupDataSetObserver.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$PopupDataSetObserver.class
deleted file mode 100644
index 526c58e2c..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$PopupDataSetObserver.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$PopupScrollListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$PopupScrollListener.class
deleted file mode 100644
index f1a0dbdbc..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$PopupScrollListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$PopupTouchInterceptor.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$PopupTouchInterceptor.class
deleted file mode 100644
index 9f28236be..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$PopupTouchInterceptor.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$ResizePopupRunnable.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$ResizePopupRunnable.class
deleted file mode 100644
index e7e0fbfe4..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow$ResizePopupRunnable.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow.class
deleted file mode 100644
index 26e6e6058..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsListPopupWindow.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$AccessibilityEventSender.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$AccessibilityEventSender.class
deleted file mode 100644
index ca6f3b758..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$AccessibilityEventSender.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$RefreshProgressRunnable.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$RefreshProgressRunnable.class
deleted file mode 100644
index 4fc92e773..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$RefreshProgressRunnable.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$SavedState$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$SavedState$1.class
deleted file mode 100644
index 1ffe42b68..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$SavedState$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$SavedState.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$SavedState.class
deleted file mode 100644
index 033d30004..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$SavedState.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar.class
deleted file mode 100644
index 1f9ec1e0e..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$DropDownAdapter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$DropDownAdapter.class
deleted file mode 100644
index 464dd5b34..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$DropDownAdapter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$DropdownPopup$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$DropdownPopup$1.class
deleted file mode 100644
index 302265b64..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$DropdownPopup$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$DropdownPopup.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$DropdownPopup.class
deleted file mode 100644
index fa256f86d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$DropdownPopup.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$SpinnerPopup.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$SpinnerPopup.class
deleted file mode 100644
index b4b1e9c44..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$SpinnerPopup.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner.class
deleted file mode 100644
index 535345f10..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsToast.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsToast.class
deleted file mode 100644
index d108da571..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsToast.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsView.class
deleted file mode 100644
index 5f358247b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/IcsView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$1.class
deleted file mode 100644
index e0491f1fb..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$TabAdapter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$TabAdapter.class
deleted file mode 100644
index 920935d58..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$TabAdapter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$TabClickListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$TabClickListener.class
deleted file mode 100644
index 187f4062c..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$TabClickListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$TabView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$TabView.class
deleted file mode 100644
index c3aa3f115..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$TabView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$VisibilityAnimListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$VisibilityAnimListener.class
deleted file mode 100644
index 3a169d972..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView$VisibilityAnimListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.class
deleted file mode 100644
index 573c7f42e..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/TabsLinearLayout.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/TabsLinearLayout.class
deleted file mode 100644
index 850a8e48a..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/internal/widget/TabsLinearLayout.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionMode$Callback.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionMode$Callback.class
deleted file mode 100644
index c122c6d33..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionMode$Callback.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionMode.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionMode.class
deleted file mode 100644
index cc64b67a5..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionMode.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionProvider$SubUiVisibilityListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionProvider$SubUiVisibilityListener.class
deleted file mode 100644
index 48f981ac8..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionProvider$SubUiVisibilityListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionProvider.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionProvider.class
deleted file mode 100644
index 1699a0fc2..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/ActionProvider.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/CollapsibleActionView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/CollapsibleActionView.class
deleted file mode 100644
index e33c66649..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/CollapsibleActionView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/Menu.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/Menu.class
deleted file mode 100644
index 917380a14..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/Menu.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuInflater$InflatedOnMenuItemClickListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuInflater$InflatedOnMenuItemClickListener.class
deleted file mode 100644
index 813b1043c..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuInflater$InflatedOnMenuItemClickListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuInflater$MenuState.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuInflater$MenuState.class
deleted file mode 100644
index 2dea4ec6d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuInflater$MenuState.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuInflater.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuInflater.class
deleted file mode 100644
index b7478d836..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuInflater.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuItem$OnActionExpandListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuItem$OnActionExpandListener.class
deleted file mode 100644
index c90552436..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuItem$OnActionExpandListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuItem$OnMenuItemClickListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuItem$OnMenuItemClickListener.class
deleted file mode 100644
index 67695affc..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuItem$OnMenuItemClickListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuItem.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuItem.class
deleted file mode 100644
index 647b33311..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/MenuItem.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/SubMenu.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/SubMenu.class
deleted file mode 100644
index 6bb94ff12..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/SubMenu.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/Window$Callback.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/Window$Callback.class
deleted file mode 100644
index 7dfe35603..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/Window$Callback.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/Window.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/view/Window.class
deleted file mode 100644
index 13353f822..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/view/Window.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$ActivityChooserModelClient.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$ActivityChooserModelClient.class
deleted file mode 100644
index 10861aa21..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$ActivityChooserModelClient.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$ActivityResolveInfo.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$ActivityResolveInfo.class
deleted file mode 100644
index 31adb7c2c..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$ActivityResolveInfo.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$ActivitySorter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$ActivitySorter.class
deleted file mode 100644
index 3c1a4ee88..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$ActivitySorter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$DefaultSorter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$DefaultSorter.class
deleted file mode 100644
index 18a7c59bf..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$DefaultSorter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoricalRecord.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoricalRecord.class
deleted file mode 100644
index 76f1d7a4e..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoricalRecord.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoryLoader$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoryLoader$1.class
deleted file mode 100644
index 698a82e55..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoryLoader$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoryLoader.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoryLoader.class
deleted file mode 100644
index 3b6dbd4d5..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoryLoader.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoryPersister.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoryPersister.class
deleted file mode 100644
index b14f900c5..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$HistoryPersister.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$OnChooseActivityListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$OnChooseActivityListener.class
deleted file mode 100644
index 151d2d570..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$OnChooseActivityListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel.class
deleted file mode 100644
index c472caf4a..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$1.class
deleted file mode 100644
index 9e35e2831..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$2.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$2.class
deleted file mode 100644
index 85836c211..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$2.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$3.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$3.class
deleted file mode 100644
index 41aceb930..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$3.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$ActivityChooserViewAdapter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$ActivityChooserViewAdapter.class
deleted file mode 100644
index 3022163db..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$ActivityChooserViewAdapter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$Callbacks.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$Callbacks.class
deleted file mode 100644
index baf4a6cbb..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$Callbacks.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$SetActivated.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$SetActivated.class
deleted file mode 100644
index 0d618cb30..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView$SetActivated.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView.class
deleted file mode 100644
index 7623980b7..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ActivityChooserView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$1.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$1.class
deleted file mode 100644
index 7c4225097..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$1.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$10.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$10.class
deleted file mode 100644
index bf157005d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$10.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$11.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$11.class
deleted file mode 100644
index bfdf071f8..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$11.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$12.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$12.class
deleted file mode 100644
index 6224e0ce7..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$12.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$2.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$2.class
deleted file mode 100644
index 51338b86c..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$2.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$3.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$3.class
deleted file mode 100644
index 302df7b6b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$3.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$4.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$4.class
deleted file mode 100644
index 4533895f4..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$4.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$5.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$5.class
deleted file mode 100644
index c5bd6815b..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$5.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$6.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$6.class
deleted file mode 100644
index 950dd18cf..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$6.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$7.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$7.class
deleted file mode 100644
index 6ffde895d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$7.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$8.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$8.class
deleted file mode 100644
index 64aa471f4..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$8.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$9.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$9.class
deleted file mode 100644
index 6d98642c2..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$9.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$OnCloseListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$OnCloseListener.class
deleted file mode 100644
index 80f7b2cf6..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$OnCloseListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$OnQueryTextListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$OnQueryTextListener.class
deleted file mode 100644
index 85659470d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$OnQueryTextListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$OnSuggestionListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$OnSuggestionListener.class
deleted file mode 100644
index bbbca3a92..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$OnSuggestionListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$SearchAutoComplete.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$SearchAutoComplete.class
deleted file mode 100644
index a266472bf..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView$SearchAutoComplete.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView.class
deleted file mode 100644
index e4e10d90f..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SearchView.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider$OnShareTargetSelectedListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider$OnShareTargetSelectedListener.class
deleted file mode 100644
index 25d140b52..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider$OnShareTargetSelectedListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider$ShareAcitivityChooserModelPolicy.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider$ShareAcitivityChooserModelPolicy.class
deleted file mode 100644
index 6fb964b34..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider$ShareAcitivityChooserModelPolicy.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider$ShareMenuItemOnMenuItemClickListener.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider$ShareMenuItemOnMenuItemClickListener.class
deleted file mode 100644
index acbf8a67d..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider$ShareMenuItemOnMenuItemClickListener.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider.class
deleted file mode 100644
index 51329f7bd..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/ShareActionProvider.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SuggestionsAdapter$ChildViewCache.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SuggestionsAdapter$ChildViewCache.class
deleted file mode 100644
index 831d346c6..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SuggestionsAdapter$ChildViewCache.class and /dev/null differ
diff --git a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SuggestionsAdapter.class b/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SuggestionsAdapter.class
deleted file mode 100644
index 36d62927c..000000000
Binary files a/actionbarsherlock/bin/classes/com/actionbarsherlock/widget/SuggestionsAdapter.class and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
deleted file mode 100644
index 42bb36645..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
deleted file mode 100644
index d12d923c3..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
deleted file mode 100644
index 612889a45..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
deleted file mode 100644
index 9a80fb7ba..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
deleted file mode 100644
index 2b4a61ab0..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
deleted file mode 100644
index 189587887..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
deleted file mode 100644
index da80a86ef..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
deleted file mode 100644
index b110188bf..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_solid_light_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
deleted file mode 100644
index 95c76e3d2..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_solid_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
deleted file mode 100644
index d6b963495..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
deleted file mode 100644
index 20d7080be..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
deleted file mode 100644
index 1dc40c9b7..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
deleted file mode 100644
index 48bc53693..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
deleted file mode 100644
index 46fcf7183..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
deleted file mode 100644
index 2adaa18e2..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
deleted file mode 100644
index 629911f00..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
deleted file mode 100644
index 11c794068..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
deleted file mode 100644
index 720f52d3c..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
deleted file mode 100644
index 6e4332fb9..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
deleted file mode 100644
index ac9f39b42..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
deleted file mode 100644
index 932b70a91..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
deleted file mode 100644
index f4ddedfd2..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
deleted file mode 100644
index fc2e90a8a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
deleted file mode 100644
index 2d8352bfc..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
deleted file mode 100644
index 365e83e51..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
deleted file mode 100644
index 0a42fb2be..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
deleted file mode 100644
index 9deb8f036..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_ab_back_holo_light.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
deleted file mode 100644
index 5b29b1cc8..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_ab_back_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
deleted file mode 100644
index bd2d459b0..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_cab_done_holo_light.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
deleted file mode 100644
index c6c30a103..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_cab_done_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_disabled.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_disabled.png
deleted file mode 100644
index 69838cce1..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_disabled.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_normal.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_normal.png
deleted file mode 100644
index 59304cf43..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_normal.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png
deleted file mode 100644
index 158e8b2b8..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png
deleted file mode 100644
index 70644b576..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_commit_search_api_holo_dark.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_commit_search_api_holo_dark.png
deleted file mode 100644
index f3899bdbc..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_commit_search_api_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_commit_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_commit_search_api_holo_light.png
deleted file mode 100644
index f215d6748..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_commit_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_go.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_go.png
deleted file mode 100644
index ca50419da..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_go.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png
deleted file mode 100644
index bd4a59411..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
deleted file mode 100644
index cb6ebdaf4..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
deleted file mode 100644
index 48d472841..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
deleted file mode 100644
index f5c513054..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_share_holo_light.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
deleted file mode 100644
index 7c12c5765..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_menu_share_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_search.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_search.png
deleted file mode 100644
index febde995b..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_search.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_search_api_holo_light.png
deleted file mode 100644
index 25921cd8d..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_voice_search.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_voice_search.png
deleted file mode 100644
index 6ddeb382c..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_voice_search.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png
deleted file mode 100644
index 649263e5c..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_activated_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__list_activated_holo.9.png
deleted file mode 100644
index 4da70ac72..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_activated_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_divider_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
deleted file mode 100644
index a57e66ac2..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_divider_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_divider_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__list_divider_holo_light.9.png
deleted file mode 100644
index 75bd2d7dc..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_divider_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_focused_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__list_focused_holo.9.png
deleted file mode 100644
index f95872898..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_focused_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_longpressed_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__list_longpressed_holo.9.png
deleted file mode 100644
index 4da70ac72..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_longpressed_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
deleted file mode 100644
index d3e72411a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_pressed_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
deleted file mode 100644
index d3e72411a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_pressed_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index cb1289628..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
deleted file mode 100644
index 233da8e3a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
deleted file mode 100644
index 29ad572b2..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
deleted file mode 100644
index 612b88727..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
deleted file mode 100644
index 6cde0bd6a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_bg_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
deleted file mode 100644
index 82af131a8..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_bg_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
deleted file mode 100644
index 15f110b9e..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_primary_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
deleted file mode 100644
index 15f110b9e..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_primary_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
deleted file mode 100644
index 4bf430f1d..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
deleted file mode 100644
index 4bf430f1d..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_48_inner_holo.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_48_inner_holo.png
deleted file mode 100644
index 919c328ba..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_48_inner_holo.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_48_outer_holo.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_48_outer_holo.png
deleted file mode 100644
index ad987cb4f..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_48_outer_holo.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
deleted file mode 100644
index 9ae770c18..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
deleted file mode 100644
index e932deee9..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
deleted file mode 100644
index 5caed9d43..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
deleted file mode 100644
index 55abe710b..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
deleted file mode 100644
index 88742927e..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
deleted file mode 100644
index a071008e5..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
deleted file mode 100644
index 8747bfc56..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
deleted file mode 100644
index 6893b36bd..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
deleted file mode 100644
index 1e6ab9aa1..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_selected_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_selected_holo.9.png
deleted file mode 100644
index 4dfaac801..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_selected_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
deleted file mode 100644
index 4060199bb..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
deleted file mode 100644
index 86304e5ab..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png
deleted file mode 100644
index 2671d27a0..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png
deleted file mode 100644
index 95781dd0c..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png
deleted file mode 100644
index 2c879af97..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png
deleted file mode 100644
index a4af865b3..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png
deleted file mode 100644
index acae79190..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png
deleted file mode 100644
index e22bb1765..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png
deleted file mode 100644
index 984332a6a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png
deleted file mode 100644
index 984332a6a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-hdpi/abs__toast_frame.9.png b/actionbarsherlock/bin/res/drawable-hdpi/abs__toast_frame.9.png
deleted file mode 100644
index 96066796a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-hdpi/abs__toast_frame.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
deleted file mode 100644
index c2fef9ade..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
deleted file mode 100644
index 54c822384..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
deleted file mode 100644
index baa529893..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
deleted file mode 100644
index fed7fa6af..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
deleted file mode 100644
index d582d3901..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
deleted file mode 100644
index 92edcc810..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
deleted file mode 100644
index cefe9cb03..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
deleted file mode 100644
index a9f2be430..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_solid_light_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
deleted file mode 100644
index a51dc9bca..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_solid_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
deleted file mode 100644
index 89eccd47e..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
deleted file mode 100644
index fa4ca7574..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
deleted file mode 100644
index f2f6fc799..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
deleted file mode 100644
index 6584f9561..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
deleted file mode 100644
index f3a769b2b..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
deleted file mode 100644
index 06010e925..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
deleted file mode 100644
index ff64b4545..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
deleted file mode 100644
index b1ac62c78..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
deleted file mode 100644
index f29242478..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
deleted file mode 100644
index b1d51c67a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
deleted file mode 100644
index 10b0432ba..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
deleted file mode 100644
index 963299580..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
deleted file mode 100644
index 0837e7d2d..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
deleted file mode 100644
index 0a71f49f9..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
deleted file mode 100644
index 4e4e51656..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
deleted file mode 100644
index a6c5c8fd8..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
deleted file mode 100644
index 9da38a326..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
deleted file mode 100644
index 7290c5c8e..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_ab_back_holo_light.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
deleted file mode 100644
index 7d944d3a3..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_ab_back_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
deleted file mode 100644
index 3382680c4..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_cab_done_holo_light.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
deleted file mode 100644
index f11b21f4d..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_cab_done_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_disabled.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_disabled.png
deleted file mode 100644
index d2ab340de..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_disabled.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_normal.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_normal.png
deleted file mode 100644
index d87cee0dd..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_normal.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png
deleted file mode 100644
index 37510ea06..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png
deleted file mode 100644
index b5fbd1df5..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_commit_search_api_holo_dark.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_commit_search_api_holo_dark.png
deleted file mode 100644
index 4f7c3ffb0..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_commit_search_api_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_commit_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_commit_search_api_holo_light.png
deleted file mode 100644
index 6adeb92cd..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_commit_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_go.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_go.png
deleted file mode 100644
index 9724d9b4b..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_go.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png
deleted file mode 100644
index 7d2cc3573..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
deleted file mode 100644
index 3b4e74628..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
deleted file mode 100644
index aa5ea4fd0..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
deleted file mode 100644
index 00e499c84..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_share_holo_light.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
deleted file mode 100644
index 240d4069c..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_menu_share_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_search.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_search.png
deleted file mode 100644
index 96e393c71..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_search.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_search_api_holo_light.png
deleted file mode 100644
index 01c540da8..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_voice_search.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_voice_search.png
deleted file mode 100644
index 2acce22af..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_voice_search.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png
deleted file mode 100644
index b65cd75ac..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_activated_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__list_activated_holo.9.png
deleted file mode 100644
index 92030f262..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_activated_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_divider_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
deleted file mode 100644
index a57e66ac2..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_divider_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_divider_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__list_divider_holo_light.9.png
deleted file mode 100644
index 75bd2d7dc..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_divider_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_focused_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__list_focused_holo.9.png
deleted file mode 100644
index 7c9fdbf1c..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_focused_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_longpressed_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__list_longpressed_holo.9.png
deleted file mode 100644
index 92030f262..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_longpressed_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
deleted file mode 100644
index d6717c1f5..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_pressed_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
deleted file mode 100644
index d6717c1f5..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_pressed_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index 9428f21a1..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
deleted file mode 100644
index 80cd8e617..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
deleted file mode 100644
index 99cf362c5..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
deleted file mode 100644
index 506368734..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
deleted file mode 100644
index efe935f28..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_bg_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
deleted file mode 100644
index 8672828a7..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_bg_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
deleted file mode 100644
index 333dda5af..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_primary_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
deleted file mode 100644
index 333dda5af..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_primary_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
deleted file mode 100644
index 29ffde6ac..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
deleted file mode 100644
index 29ffde6ac..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_48_inner_holo.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_48_inner_holo.png
deleted file mode 100644
index ff1dc7f59..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_48_inner_holo.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_48_outer_holo.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_48_outer_holo.png
deleted file mode 100644
index 0b113bf93..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_48_outer_holo.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
deleted file mode 100644
index 6c63dd4bf..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
deleted file mode 100644
index 3928d0d01..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
deleted file mode 100644
index f7219e891..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
deleted file mode 100644
index ede8b34c4..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
deleted file mode 100644
index e4de3f63b..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
deleted file mode 100644
index 334ec168a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
deleted file mode 100644
index 8d9531e4f..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
deleted file mode 100644
index 0f504f82c..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
deleted file mode 100644
index bce0e08ea..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_selected_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_selected_holo.9.png
deleted file mode 100644
index dd022de2f..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_selected_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
deleted file mode 100644
index 2852fb5de..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
deleted file mode 100644
index d2716b338..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png
deleted file mode 100644
index fb5c80139..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png
deleted file mode 100644
index 9ed25c718..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png
deleted file mode 100644
index 77020e02f..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png
deleted file mode 100644
index 6136c0848..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png
deleted file mode 100644
index 878225d3f..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png
deleted file mode 100644
index 878225d3f..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png
deleted file mode 100644
index 622388745..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png
deleted file mode 100644
index 622388745..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-mdpi/abs__toast_frame.9.png b/actionbarsherlock/bin/res/drawable-mdpi/abs__toast_frame.9.png
deleted file mode 100644
index c366f77cd..000000000
Binary files a/actionbarsherlock/bin/res/drawable-mdpi/abs__toast_frame.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
deleted file mode 100644
index d01fae992..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
deleted file mode 100644
index 5fc7d87f6..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
deleted file mode 100644
index f6cbc621b..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
deleted file mode 100644
index f395cbde0..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
deleted file mode 100644
index 6e6b999bd..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
deleted file mode 100644
index 61b971e18..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
deleted file mode 100644
index 5c94e5451..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
deleted file mode 100644
index 2c4dd4f98..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
deleted file mode 100644
index 27d6c8b94..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
deleted file mode 100644
index 582630654..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
deleted file mode 100644
index 3e7222385..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
deleted file mode 100644
index d2d77540b..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
deleted file mode 100644
index 140518f82..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
deleted file mode 100644
index 97a6bd57a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
deleted file mode 100644
index 3069943fc..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
deleted file mode 100644
index 920d2b585..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
deleted file mode 100644
index dfe74064d..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
deleted file mode 100644
index 959ca7af9..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
deleted file mode 100644
index df9721249..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
deleted file mode 100644
index 792018822..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
deleted file mode 100644
index 1801d3436..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
deleted file mode 100644
index b3d3e1991..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
deleted file mode 100644
index 1bf70ca23..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
deleted file mode 100644
index 100d3166a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
deleted file mode 100644
index 58bdedd23..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
deleted file mode 100644
index 66d9d8dce..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
deleted file mode 100644
index bfc1c660d..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
deleted file mode 100644
index 87a5a420b..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
deleted file mode 100644
index fd5f4161d..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
deleted file mode 100644
index 0ccab808c..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_clear_disabled.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_clear_disabled.png
deleted file mode 100644
index 6cc02c525..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_clear_disabled.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png
deleted file mode 100644
index 3d2cf500e..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png
deleted file mode 100644
index 0efacf7b8..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_commit_search_api_holo_dark.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_commit_search_api_holo_dark.png
deleted file mode 100644
index 65fc0789a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_commit_search_api_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_commit_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_commit_search_api_holo_light.png
deleted file mode 100644
index 81aa93765..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_commit_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_go.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_go.png
deleted file mode 100644
index b4620797c..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_go.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png
deleted file mode 100644
index 7007b15ce..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
deleted file mode 100644
index ef9792a44..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
deleted file mode 100644
index 3f275ad1a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
deleted file mode 100644
index 4492c4987..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
deleted file mode 100644
index a61854b47..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_search.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_search.png
deleted file mode 100644
index 3d4d4e7ac..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_search.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_search_api_holo_light.png
deleted file mode 100644
index 280ba8f09..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_voice_search.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_voice_search.png
deleted file mode 100644
index ab8d0a9ff..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_voice_search.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png
deleted file mode 100644
index 69f18b919..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_activated_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_activated_holo.9.png
deleted file mode 100644
index c6cbc4d6a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_activated_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
deleted file mode 100644
index c1692f8e3..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_divider_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
deleted file mode 100644
index e190cfc4a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_divider_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_focused_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_focused_holo.9.png
deleted file mode 100644
index 9059f3e5e..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_focused_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_longpressed_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
deleted file mode 100644
index c6cbc4d6a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_longpressed_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
deleted file mode 100644
index 8acdbf453..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
deleted file mode 100644
index 8acdbf453..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index 0117091fa..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
deleted file mode 100644
index 4f123024c..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
deleted file mode 100644
index d91080651..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
deleted file mode 100644
index 68494e75e..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
deleted file mode 100644
index b8a964bca..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
deleted file mode 100644
index 380f8d1eb..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
deleted file mode 100644
index a6bd0ce71..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
deleted file mode 100644
index a6bd0ce71..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
deleted file mode 100644
index 058c512cb..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
deleted file mode 100644
index 058c512cb..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_48_inner_holo.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
deleted file mode 100644
index 662036ca8..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_48_inner_holo.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_48_outer_holo.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
deleted file mode 100644
index 6d33f3140..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_48_outer_holo.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
deleted file mode 100644
index 487c06b30..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
deleted file mode 100644
index 3724097ee..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
deleted file mode 100644
index b7088e1d9..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
deleted file mode 100644
index 8e91ab97b..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
deleted file mode 100644
index e16fead15..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
deleted file mode 100644
index 475dfcd97..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
deleted file mode 100644
index 3b6ec51de..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
deleted file mode 100644
index 6e8297204..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
deleted file mode 100644
index 140ebfde1..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_selected_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_selected_holo.9.png
deleted file mode 100644
index a94f09840..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_selected_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
deleted file mode 100644
index 25ec789cf..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
deleted file mode 100644
index c5ed3cb95..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png
deleted file mode 100644
index f908c68e2..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png
deleted file mode 100644
index 4aa3617d3..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png
deleted file mode 100644
index 7fe285a1f..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png
deleted file mode 100644
index 610170ea5..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png
deleted file mode 100644
index 17c70ff8a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png
deleted file mode 100644
index 17c70ff8a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png
deleted file mode 100644
index 31458da13..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png
deleted file mode 100644
index 643271140..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png and /dev/null differ
diff --git a/actionbarsherlock/bin/res/drawable-xhdpi/abs__toast_frame.9.png b/actionbarsherlock/bin/res/drawable-xhdpi/abs__toast_frame.9.png
deleted file mode 100644
index dcc64912a..000000000
Binary files a/actionbarsherlock/bin/res/drawable-xhdpi/abs__toast_frame.9.png and /dev/null differ
diff --git a/actionbarsherlock/gen/com/actionbarsherlock/BuildConfig.java b/actionbarsherlock/gen/com/actionbarsherlock/BuildConfig.java
deleted file mode 100644
index ceb2ab073..000000000
--- a/actionbarsherlock/gen/com/actionbarsherlock/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package com.actionbarsherlock;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/actionbarsherlock/gen/com/actionbarsherlock/R.java b/actionbarsherlock/gen/com/actionbarsherlock/R.java
index b6054d749..7fb2f25bb 100644
--- a/actionbarsherlock/gen/com/actionbarsherlock/R.java
+++ b/actionbarsherlock/gen/com/actionbarsherlock/R.java
@@ -2167,7 +2167,7 @@ theme attribute (in the form
          */
         public static final int[] SherlockSpinner = {
             0x010100af, 0x01010175, 0x01010176, 0x0101017b,
-            0x01010262, 0x010102ac, 0x010102ad, 0x0101041f
+            0x01010262, 0x010102ac, 0x010102ad, 0x0101043a
         };
         /**
           <p>
diff --git a/android-obd-simulator/src/org/envirocar/obd/SimulatorService.java b/android-obd-simulator/src/org/envirocar/obd/SimulatorService.java
index def0f0911..f0d1b9dbc 100644
--- a/android-obd-simulator/src/org/envirocar/obd/SimulatorService.java
+++ b/android-obd-simulator/src/org/envirocar/obd/SimulatorService.java
@@ -326,6 +326,7 @@ private class ConnectedThread extends Thread {
         private final BluetoothSocket mmSocket;
         private final InputStream mmInStream;
         private final OutputStream mmOutStream;
+		private int count;
 
         public ConnectedThread(BluetoothSocket socket, String socketType) {
             Log.d(TAG, "create ConnectedThread: " + socketType);
@@ -356,6 +357,16 @@ public void run() {
                     int index = 0;
                     int i;
             		while ((i = mmInStream.read()) != -1) {
+//            			if (count > 20) {
+//            				try {
+//    							Thread.sleep(11000);
+//    							cancel();
+//    							connectionLost();
+//    							return;
+//    						} catch (InterruptedException e) {
+//    							e.printStackTrace();
+//    						}
+//            			}
             			byte b = (byte) i;
             			if (b == (byte) '\r') {
             				break;
@@ -366,6 +377,7 @@ public void run() {
 
             		if (index == 0) continue;
             		
+            		count++;
                     // Send the obtained bytes to the UI Activity
                     mHandler.obtainMessage(OBDSimulator.MESSAGE_READ, index, -1, buffer)
                             .sendToTarget();
diff --git a/org.envirocar.app.test/assets/fueling_create_mockup.json b/org.envirocar.app.test/assets/fueling_create_mockup.json
new file mode 100644
index 000000000..867e37ee5
--- /dev/null
+++ b/org.envirocar.app.test/assets/fueling_create_mockup.json
@@ -0,0 +1,19 @@
+{ 
+  "fuelType": "gasoline",
+  "comment": "test",
+  "car": "51cac874e4b0a34fb6c5ce94",
+  "cost": {
+    "value": 12.2,
+    "unit": "eur"
+  },
+  "time": "1970-01-01T00:00:00Z",
+  "missedFuelStop": false,
+  "mileage": {
+    "value": 12345,
+    "unit": "km"
+  },
+  "volume": {
+    "value": 7.2,
+    "unit": "l"
+  }
+}
diff --git a/org.envirocar.app.test/assets/user_mockup.json b/org.envirocar.app.test/assets/user_mockup.json
index 954240152..623be104b 100644
--- a/org.envirocar.app.test/assets/user_mockup.json
+++ b/org.envirocar.app.test/assets/user_mockup.json
@@ -1 +1 @@
-{"name":"matthes","mail":"matthes.rieke.01@gmail.com","created":"2013-10-02T09:03:59Z","modified":"2013-10-02T09:32:43Z","firstName":"Matthes","lastName":"Rieke","gender":"m","dayOfBirth":"1983-12-21","aboutMe":"whatever...2","country":"Germany","language":"de-DE","acceptedTermsOfUseVersion":"2013-10-02"}
\ No newline at end of file
+{"name":"matthes","mail":"matthes.rieke.01@gmail.com","created":"2013-10-02T09:03:59Z","modified":"2013-10-02T09:32:43Z","firstName":"Matthes","lastName":"Rieke","gender":"m","dayOfBirth":"1983-12-21","aboutMe":"whatever...2","country":"Germany","language":"de-DE","touVersion":"2013-10-02"}
\ No newline at end of file
diff --git a/org.envirocar.app.test/src/org/envirocar/app/test/FuelingEncoderTest.java b/org.envirocar.app.test/src/org/envirocar/app/test/FuelingEncoderTest.java
new file mode 100644
index 000000000..09032e2c1
--- /dev/null
+++ b/org.envirocar.app.test/src/org/envirocar/app/test/FuelingEncoderTest.java
@@ -0,0 +1,90 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+
+package org.envirocar.app.test;
+
+import java.io.IOException;
+import java.util.Date;
+
+import junit.framework.Assert;
+
+import org.envirocar.app.exception.InvalidObjectStateException;
+import org.envirocar.app.json.FuelingEncoder;
+import org.envirocar.app.model.Car;
+import org.envirocar.app.model.Car.FuelType;
+import org.envirocar.app.model.Fueling;
+import org.envirocar.app.model.NumberWithUOM;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class FuelingEncoderTest extends ResourceLoadingTestCase {
+	
+	private Car car = new Car(FuelType.GASOLINE, "manuf", "modl", "51cac874e4b0a34fb6c5ce94", 1234, 2345);
+
+	public void testTrackJsonCreation() throws JSONException,  IOException, InvalidObjectStateException {
+		String expected = createExpectedJson().toString();
+		
+		Fueling f = createFueling();
+		
+		String json = new FuelingEncoder().createFuelingJson(f).toString();
+		
+		Assert.assertTrue("The JSON was not as expected!", json.equals(expected));
+	}
+
+	public void testExceptionOnIncompleteObject() throws JSONException {
+		Exception exc = null;
+		try {
+			new FuelingEncoder().createFuelingJson(createIncompleteFueling());
+		} catch (InvalidObjectStateException e) {
+			exc = e;
+		}
+		
+		Assert.assertNotNull(exc);
+	}
+	
+	private Fueling createFueling() {
+		Fueling result = new Fueling();
+		result.setCar(car);
+		result.setComment("test");
+		result.setMissedFuelStop(false);
+		result.setCost(new NumberWithUOM(12.2, "eur"));
+		result.setMileage(new NumberWithUOM(12345, "km"));
+		result.setVolume(new NumberWithUOM(7.2, "l"));
+		result.setTime(new Date(0L));
+		return result;
+	}
+	
+	
+	private Fueling createIncompleteFueling() {
+		Fueling result = new Fueling();
+		result.setComment("test");
+		result.setMissedFuelStop(false);
+		result.setMileage(new NumberWithUOM(12345, "km"));
+		result.setTime(new Date(0L));
+		return result;
+	}
+
+	private JSONObject createExpectedJson() throws IOException, JSONException {
+		String json = readJsonAsset("fueling_create_mockup.json");
+		return new JSONObject(json);
+	}
+
+}
diff --git a/org.envirocar.app.test/src/org/envirocar/app/test/UserTest.java b/org.envirocar.app.test/src/org/envirocar/app/test/UserTest.java
index 279eb6f74..d7732dc36 100644
--- a/org.envirocar.app.test/src/org/envirocar/app/test/UserTest.java
+++ b/org.envirocar.app.test/src/org/envirocar/app/test/UserTest.java
@@ -25,7 +25,7 @@
 
 import junit.framework.Assert;
 
-import org.envirocar.app.application.User;
+import org.envirocar.app.model.User;
 import org.json.JSONException;
 
 
@@ -35,8 +35,8 @@ public void testUserParsing() throws IOException, JSONException {
 		InputStream is = getInstrumentation().getContext().getAssets().open("user_mockup.json");
 		User user = User.fromJson(readJson(is));
 		
-		Assert.assertTrue("missing acceptedTermsOfUseVersion", user.getAcceptedTermsOfUseVersion() != null);
-		Assert.assertTrue("unexpected acceptedTermsOfUseVersion", user.getAcceptedTermsOfUseVersion().equals("2013-10-02"));
+		Assert.assertTrue("missing touVersion", user.getTouVersion() != null);
+		Assert.assertTrue("unexpected acceptedTermsOfUseVersion", user.getTouVersion().equals("2013-10-02"));
 		Assert.assertTrue("unexpected username", user.getUsername().equals("matthes"));
 	}
 	
diff --git a/org.envirocar.app.test/src/org/envirocar/app/test/commands/IntakeTemperatureTest.java b/org.envirocar.app.test/src/org/envirocar/app/test/commands/IntakeTemperatureTest.java
new file mode 100644
index 000000000..44d9cc718
--- /dev/null
+++ b/org.envirocar.app.test/src/org/envirocar/app/test/commands/IntakeTemperatureTest.java
@@ -0,0 +1,49 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.test.commands;
+
+import junit.framework.Assert;
+
+import org.envirocar.app.commands.CommonCommand.CommonCommandState;
+import org.envirocar.app.commands.IntakeTemperature;
+
+import android.test.AndroidTestCase;
+
+public class IntakeTemperatureTest extends AndroidTestCase {
+	
+	public void testParsing() {
+		byte[] bytes = createBytes();
+		IntakeTemperature cmd = new IntakeTemperature();
+		cmd.setRawData(bytes);
+		cmd.parseRawData();
+		
+		Assert.assertTrue(cmd.getCommandState() == CommonCommandState.FINISHED);
+		
+		double temp = cmd.getNumberResult().doubleValue();
+		Assert.assertTrue(temp == 23.0);
+	}
+
+	private byte[] createBytes() {
+		return "410F3F".getBytes();
+	}
+
+
+}
diff --git a/org.envirocar.app.test/src/org/envirocar/app/test/commands/PIDSupportedTest.java b/org.envirocar.app.test/src/org/envirocar/app/test/commands/PIDSupportedTest.java
index 3e0e513f6..c64e43b10 100644
--- a/org.envirocar.app.test/src/org/envirocar/app/test/commands/PIDSupportedTest.java
+++ b/org.envirocar.app.test/src/org/envirocar/app/test/commands/PIDSupportedTest.java
@@ -28,6 +28,7 @@
 import junit.framework.Assert;
 
 import org.envirocar.app.commands.PIDSupported;
+import org.envirocar.app.commands.CommonCommand.CommonCommandState;
 import org.envirocar.app.commands.PIDUtil.PID;
 
 import android.test.AndroidTestCase;
@@ -44,6 +45,15 @@ public void testPIDSupportedParsing() {
 		
 		assertResult(result);
 	}
+	
+	public void testPIDSupportedFail() {
+		PIDSupported cmd = new PIDSupported();
+		
+		cmd.setRawData(createResponseFailMockup());
+		cmd.parseRawData();
+		
+		assertTrue(cmd.getCommandState() == CommonCommandState.EXECUTION_ERROR);
+	}
 
 	private void assertResult(Set<PID> result) {
 		Set<PID> expected = new HashSet<PID>();
@@ -71,6 +81,15 @@ private byte[] createResponseMockup() {
 		sb.append("107B0000");
 		return sb.toString().getBytes();
 	}
+
+	private byte[] createResponseFailMockup() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("4100");
+		sb.append("107B0000");
+		sb.append("4100");
+		sb.append("107B0000");
+		return sb.toString().getBytes();
+	}
 	
 }
 
diff --git a/org.envirocar.app.test/src/org/envirocar/app/test/commands/drivedeck/CommandTest.java b/org.envirocar.app.test/src/org/envirocar/app/test/commands/drivedeck/CommandTest.java
new file mode 100644
index 000000000..888aaada4
--- /dev/null
+++ b/org.envirocar.app.test/src/org/envirocar/app/test/commands/drivedeck/CommandTest.java
@@ -0,0 +1,35 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.test.commands.drivedeck;
+
+import org.envirocar.app.protocol.ResponseParser;
+import org.envirocar.app.protocol.drivedeck.DriveDeckSportConnector;
+
+import android.test.AndroidTestCase;
+
+public class CommandTest extends AndroidTestCase {
+
+	protected ResponseParser getResponseParser() {
+		DriveDeckSportConnector conn = new DriveDeckSportConnector();
+		return conn.new LocalResponseParser();
+	}
+	
+}
diff --git a/org.envirocar.app.test/src/org/envirocar/app/test/commands/drivedeck/IntakeTemperatureTest.java b/org.envirocar.app.test/src/org/envirocar/app/test/commands/drivedeck/IntakeTemperatureTest.java
new file mode 100644
index 000000000..422ea9d1a
--- /dev/null
+++ b/org.envirocar.app.test/src/org/envirocar/app/test/commands/drivedeck/IntakeTemperatureTest.java
@@ -0,0 +1,48 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.test.commands.drivedeck;
+
+import junit.framework.Assert;
+
+import org.envirocar.app.commands.CommonCommand;
+import org.envirocar.app.commands.IntakeTemperature;
+import org.envirocar.app.protocol.ResponseParser;
+
+public class IntakeTemperatureTest extends CommandTest {
+	
+	public void testParsing() {
+		ResponseParser parser = getResponseParser();
+		
+		byte[] bytes = createBytes();
+		CommonCommand resp = parser.processResponse(bytes, 0, bytes.length);
+		
+		Assert.assertTrue(resp != null && resp instanceof IntakeTemperature);
+		
+		double temp = ((IntakeTemperature) resp).getNumberResult().doubleValue();
+		Assert.assertTrue(temp == 23.0);
+	}
+
+	private byte[] createBytes() {
+		return "B52<?0".getBytes();
+	}
+
+
+}
diff --git a/org.envirocar.app.test/src/org/envirocar/app/test/dao/AnnouncementsDAOTest.java b/org.envirocar.app.test/src/org/envirocar/app/test/dao/AnnouncementsDAOTest.java
index 6c43e4cbb..157b42f82 100644
--- a/org.envirocar.app.test/src/org/envirocar/app/test/dao/AnnouncementsDAOTest.java
+++ b/org.envirocar.app.test/src/org/envirocar/app/test/dao/AnnouncementsDAOTest.java
@@ -26,9 +26,9 @@
 
 import junit.framework.Assert;
 
-import org.envirocar.app.dao.AnnouncementsRetrievalException;
 import org.envirocar.app.dao.DAOProvider;
 import org.envirocar.app.dao.cache.CacheAnnouncementsDAO;
+import org.envirocar.app.dao.exception.AnnouncementsRetrievalException;
 import org.envirocar.app.model.Announcement;
 import org.envirocar.app.model.Announcement.Priority;
 import org.envirocar.app.util.VersionRange.Version;
diff --git a/org.envirocar.app.test/src/org/envirocar/app/test/dao/CacheDAOTest.java b/org.envirocar.app.test/src/org/envirocar/app/test/dao/CacheDAOTest.java
index 78be8e091..ac9648e7f 100644
--- a/org.envirocar.app.test/src/org/envirocar/app/test/dao/CacheDAOTest.java
+++ b/org.envirocar.app.test/src/org/envirocar/app/test/dao/CacheDAOTest.java
@@ -57,6 +57,14 @@ protected void prepareCache(File baseFolder, String asset, String assetFile) thr
 		fw.close();
 		isr.close();
 	}
+	
+	protected void clearCache(File baseFolder, String assetFile) throws IOException {
+		File f = new File(baseFolder, assetFile);
+		
+		if (f != null && f.exists()) {
+			f.delete();
+		}
+	}
 
 	public DAOProvider getDAOProvider() throws IOException {
 		MockupCacheDirectoryProvider mockupDir = getMockupDir();
diff --git a/org.envirocar.app.test/src/org/envirocar/app/test/dao/SensorDAOTest.java b/org.envirocar.app.test/src/org/envirocar/app/test/dao/SensorDAOTest.java
index 8f7a4ee17..4d9338b67 100644
--- a/org.envirocar.app.test/src/org/envirocar/app/test/dao/SensorDAOTest.java
+++ b/org.envirocar.app.test/src/org/envirocar/app/test/dao/SensorDAOTest.java
@@ -27,13 +27,13 @@
 
 import org.envirocar.app.dao.DAOProvider;
 import org.envirocar.app.dao.SensorDAO;
-import org.envirocar.app.dao.SensorRetrievalException;
 import org.envirocar.app.dao.cache.CacheSensorDAO;
+import org.envirocar.app.dao.exception.SensorRetrievalException;
 import org.envirocar.app.model.Car;
 
 public class SensorDAOTest extends CacheDAOTest {
 	
-	public void testGetAllSensorsCached() throws IOException, SensorRetrievalException {
+	public void testGetAllSensorsCachedLegacy() throws IOException, SensorRetrievalException {
 		DAOProvider prov = getDAOProvider();
 		
 		prepareCache(getMockupDir().getBaseFolder(), "sensors_mockup.json", CacheSensorDAO.CAR_CACHE_FILE_NAME);
@@ -43,4 +43,18 @@ public void testGetAllSensorsCached() throws IOException, SensorRetrievalExcepti
 		Assert.assertTrue("Expected 1 sensor. Got "+sensors.size(), sensors.size() == 1);
 	}
 	
+	public void testGetAllSensorsCached() throws IOException, SensorRetrievalException {
+		DAOProvider prov = getDAOProvider();
+		
+		prepareCache(getMockupDir().getBaseFolder(), "sensors_mockup.json", CacheSensorDAO.CAR_CACHE_FILE_NAME+1);
+		prepareCache(getMockupDir().getBaseFolder(), "sensors_mockup.json", CacheSensorDAO.CAR_CACHE_FILE_NAME+2);
+		
+		SensorDAO dao = prov.getSensorDAO();
+		List<Car> sensors = dao.getAllSensors();
+		Assert.assertTrue("Expected 2 sensors. Got "+sensors.size(), sensors.size() == 2);
+		
+		clearCache(getMockupDir().getBaseFolder(), CacheSensorDAO.CAR_CACHE_FILE_NAME+1);
+		clearCache(getMockupDir().getBaseFolder(), CacheSensorDAO.CAR_CACHE_FILE_NAME+2);
+	}
+	
 }
diff --git a/org.envirocar.app.test/src/org/envirocar/app/test/dao/TrackDecoderTest.java b/org.envirocar.app.test/src/org/envirocar/app/test/dao/TrackDecoderTest.java
new file mode 100644
index 000000000..a09a222f2
--- /dev/null
+++ b/org.envirocar.app.test/src/org/envirocar/app/test/dao/TrackDecoderTest.java
@@ -0,0 +1,66 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.test.dao;
+
+import junit.framework.Assert;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.ProtocolVersion;
+import org.apache.http.StatusLine;
+import org.apache.http.message.BasicHttpResponse;
+import org.apache.http.message.BasicStatusLine;
+import org.envirocar.app.dao.exception.TrackRetrievalException;
+import org.envirocar.app.json.TrackDecoder;
+
+import android.test.AndroidTestCase;
+
+public class TrackDecoderTest extends AndroidTestCase {
+
+	public void testTotalTrackCount() throws TrackRetrievalException {
+		BasicHttpResponse response = new BasicHttpResponse(createStatusLine());
+		response.setHeader("Link", "<https://envirocar.org/api/stable/users/matthes/tracks?limit=1&page=7>;rel=last;type=application/json, <https://envirocar.org/api/stable/users/matthes/tracks?limit=1&page=2>;rel=next;type=application/json");
+		Integer count = new TrackDecoder().resolveTrackCount(response);
+		
+		Assert.assertTrue(count.intValue() == 7);
+		
+		response = new BasicHttpResponse(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 204, ""));
+		response.setHeader("Link", "<https://envirocar.org/api/stable/users/matthes/tracks?page=6>;rel=last");
+		count = new TrackDecoder().resolveTrackCount(response);
+		
+		Assert.assertTrue(count.intValue() == 6);
+
+	}
+	
+	private StatusLine createStatusLine() {
+		return new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 204, "");
+	}
+
+	public void testLocationParsing() throws TrackRetrievalException {
+		HttpResponse resp = new BasicHttpResponse(createStatusLine());
+		
+		resp.setHeader("Location", "http:/this.is.my.envirocar.server/api/tracks/1337-resource");
+		
+		String result = new TrackDecoder().resolveLocation(resp);
+		
+		Assert.assertTrue(result.equals("1337-resource"));
+	}
+	
+}
diff --git a/org.envirocar.app.test/src/org/envirocar/app/test/it/db/TrackJsonParsingTest.java b/org.envirocar.app.test/src/org/envirocar/app/test/it/db/TrackJsonParsingTest.java
index d68383748..22abb2ee2 100644
--- a/org.envirocar.app.test/src/org/envirocar/app/test/it/db/TrackJsonParsingTest.java
+++ b/org.envirocar.app.test/src/org/envirocar/app/test/it/db/TrackJsonParsingTest.java
@@ -1,17 +1,18 @@
 package org.envirocar.app.test.it.db;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.text.ParseException;
 
 import junit.framework.Assert;
 
+import org.envirocar.app.json.TrackDecoder;
 import org.envirocar.app.storage.DbAdapterImpl;
 import org.envirocar.app.storage.Track;
 import org.envirocar.app.storage.Track.TrackStatus;
 import org.envirocar.app.storage.TrackWithoutMeasurementsException;
 import org.envirocar.app.test.ResourceLoadingTestCase;
 import org.json.JSONException;
-import org.json.JSONObject;
 
 public class TrackJsonParsingTest extends ResourceLoadingTestCase {
 
@@ -20,7 +21,7 @@ public void testParsingAndResolving() throws NumberFormatException, JSONExceptio
 			DbAdapterImpl.init(getInstrumentation().getTargetContext());
 		}
 
-		Track t = Track.fromJson(createJson(), DbAdapterImpl.instance());
+		Track t = new TrackDecoder().fromJson(createJsonViaStream());
 		
 		Track dbTrack = DbAdapterImpl.instance().getTrack(t.getId());
 		
@@ -38,8 +39,8 @@ public void testParsingAndResolving() throws NumberFormatException, JSONExceptio
 		}
 	}
 
-	private JSONObject createJson() throws JSONException, IOException {
-		return new JSONObject(readJsonAsset("track_mockup.json"));
+	private InputStream createJsonViaStream() throws IOException {
+		return getInstrumentation().getContext().getAssets().open("track_mockup.json");
 	}
 	
 }
diff --git a/org.envirocar.app/AndroidManifest.xml b/org.envirocar.app/AndroidManifest.xml
index 0432f4d84..5cf72d4ed 100644
--- a/org.envirocar.app/AndroidManifest.xml
+++ b/org.envirocar.app/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.envirocar.app"
-    android:versionCode="20"
-    android:versionName="0.8.0">
+    android:versionCode="21"
+    android:versionName="0.9.0">
 
     <uses-sdk
         android:minSdkVersion="10"
diff --git a/org.envirocar.app/libs/android-async-http-master-4b6eb976ae68e6aa6f55aabb3a6e9200bcadd3fb.jar b/org.envirocar.app/libs/android-async-http-master-4b6eb976ae68e6aa6f55aabb3a6e9200bcadd3fb.jar
deleted file mode 100644
index 5435e1bdd..000000000
Binary files a/org.envirocar.app/libs/android-async-http-master-4b6eb976ae68e6aa6f55aabb3a6e9200bcadd3fb.jar and /dev/null differ
diff --git a/org.envirocar.app/res/drawable-hdpi-v11/logbook.png b/org.envirocar.app/res/drawable-hdpi-v11/logbook.png
new file mode 100644
index 000000000..64ed6cc37
Binary files /dev/null and b/org.envirocar.app/res/drawable-hdpi-v11/logbook.png differ
diff --git a/org.envirocar.app/res/drawable-hdpi/bt_device_active.png b/org.envirocar.app/res/drawable-hdpi/bt_device_active.png
new file mode 100644
index 000000000..627e4ebdc
Binary files /dev/null and b/org.envirocar.app/res/drawable-hdpi/bt_device_active.png differ
diff --git a/org.envirocar.app/res/drawable-hdpi/bt_device_not_selected.png b/org.envirocar.app/res/drawable-hdpi/bt_device_not_selected.png
new file mode 100644
index 000000000..c7a927cc7
Binary files /dev/null and b/org.envirocar.app/res/drawable-hdpi/bt_device_not_selected.png differ
diff --git a/org.envirocar.app/res/drawable-hdpi/bt_device_pending.png b/org.envirocar.app/res/drawable-hdpi/bt_device_pending.png
new file mode 100644
index 000000000..c8edc51c3
Binary files /dev/null and b/org.envirocar.app/res/drawable-hdpi/bt_device_pending.png differ
diff --git a/org.envirocar.app/res/drawable-hdpi/bt_device_stopped.png b/org.envirocar.app/res/drawable-hdpi/bt_device_stopped.png
new file mode 100644
index 000000000..c0d4ac0d9
Binary files /dev/null and b/org.envirocar.app/res/drawable-hdpi/bt_device_stopped.png differ
diff --git a/org.envirocar.app/res/drawable-hdpi/car_no.png b/org.envirocar.app/res/drawable-hdpi/car_no.png
new file mode 100644
index 000000000..7019b2f43
Binary files /dev/null and b/org.envirocar.app/res/drawable-hdpi/car_no.png differ
diff --git a/org.envirocar.app/res/drawable-hdpi/car_ok.png b/org.envirocar.app/res/drawable-hdpi/car_ok.png
new file mode 100644
index 000000000..ef32cc20b
Binary files /dev/null and b/org.envirocar.app/res/drawable-hdpi/car_ok.png differ
diff --git a/org.envirocar.app/res/drawable-hdpi/gps_fix.png b/org.envirocar.app/res/drawable-hdpi/gps_fix.png
new file mode 100644
index 000000000..adf9fabf8
Binary files /dev/null and b/org.envirocar.app/res/drawable-hdpi/gps_fix.png differ
diff --git a/org.envirocar.app/res/drawable-hdpi/gps_nofix.png b/org.envirocar.app/res/drawable-hdpi/gps_nofix.png
new file mode 100644
index 000000000..896750f43
Binary files /dev/null and b/org.envirocar.app/res/drawable-hdpi/gps_nofix.png differ
diff --git a/org.envirocar.app/res/drawable-hdpi/logbook.png b/org.envirocar.app/res/drawable-hdpi/logbook.png
new file mode 100644
index 000000000..3bb027f8e
Binary files /dev/null and b/org.envirocar.app/res/drawable-hdpi/logbook.png differ
diff --git a/org.envirocar.app/res/drawable-mdpi-v11/logbook.png b/org.envirocar.app/res/drawable-mdpi-v11/logbook.png
new file mode 100644
index 000000000..ffa6e7828
Binary files /dev/null and b/org.envirocar.app/res/drawable-mdpi-v11/logbook.png differ
diff --git a/org.envirocar.app/res/drawable-mdpi/bt_device_active.png b/org.envirocar.app/res/drawable-mdpi/bt_device_active.png
new file mode 100644
index 000000000..71a0017e3
Binary files /dev/null and b/org.envirocar.app/res/drawable-mdpi/bt_device_active.png differ
diff --git a/org.envirocar.app/res/drawable-mdpi/bt_device_not_selected.png b/org.envirocar.app/res/drawable-mdpi/bt_device_not_selected.png
new file mode 100644
index 000000000..6dd05bc30
Binary files /dev/null and b/org.envirocar.app/res/drawable-mdpi/bt_device_not_selected.png differ
diff --git a/org.envirocar.app/res/drawable-mdpi/bt_device_pending.png b/org.envirocar.app/res/drawable-mdpi/bt_device_pending.png
new file mode 100644
index 000000000..f24386a1d
Binary files /dev/null and b/org.envirocar.app/res/drawable-mdpi/bt_device_pending.png differ
diff --git a/org.envirocar.app/res/drawable-mdpi/bt_device_stopped.png b/org.envirocar.app/res/drawable-mdpi/bt_device_stopped.png
new file mode 100644
index 000000000..6bcd6d26e
Binary files /dev/null and b/org.envirocar.app/res/drawable-mdpi/bt_device_stopped.png differ
diff --git a/org.envirocar.app/res/drawable-mdpi/car_no.png b/org.envirocar.app/res/drawable-mdpi/car_no.png
new file mode 100644
index 000000000..f79de6e22
Binary files /dev/null and b/org.envirocar.app/res/drawable-mdpi/car_no.png differ
diff --git a/org.envirocar.app/res/drawable-mdpi/car_ok.png b/org.envirocar.app/res/drawable-mdpi/car_ok.png
new file mode 100644
index 000000000..21485e9b1
Binary files /dev/null and b/org.envirocar.app/res/drawable-mdpi/car_ok.png differ
diff --git a/org.envirocar.app/res/drawable-mdpi/gps_fix.png b/org.envirocar.app/res/drawable-mdpi/gps_fix.png
new file mode 100644
index 000000000..d16b094f7
Binary files /dev/null and b/org.envirocar.app/res/drawable-mdpi/gps_fix.png differ
diff --git a/org.envirocar.app/res/drawable-mdpi/gps_nofix.png b/org.envirocar.app/res/drawable-mdpi/gps_nofix.png
new file mode 100644
index 000000000..6ae4a67dc
Binary files /dev/null and b/org.envirocar.app/res/drawable-mdpi/gps_nofix.png differ
diff --git a/org.envirocar.app/res/drawable-mdpi/logbook.png b/org.envirocar.app/res/drawable-mdpi/logbook.png
new file mode 100644
index 000000000..3cee641bc
Binary files /dev/null and b/org.envirocar.app/res/drawable-mdpi/logbook.png differ
diff --git a/org.envirocar.app/res/drawable-xhdpi-v11/logbook.png b/org.envirocar.app/res/drawable-xhdpi-v11/logbook.png
new file mode 100644
index 000000000..f0773a46c
Binary files /dev/null and b/org.envirocar.app/res/drawable-xhdpi-v11/logbook.png differ
diff --git a/org.envirocar.app/res/drawable-xhdpi/logbook.png b/org.envirocar.app/res/drawable-xhdpi/logbook.png
new file mode 100644
index 000000000..29f5cb0f9
Binary files /dev/null and b/org.envirocar.app/res/drawable-xhdpi/logbook.png differ
diff --git a/org.envirocar.app/res/drawable/rounded_border.xml b/org.envirocar.app/res/drawable/rounded_border.xml
index 0e1026e51..b0cb33f50 100644
--- a/org.envirocar.app/res/drawable/rounded_border.xml
+++ b/org.envirocar.app/res/drawable/rounded_border.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#FFFFFF"/>
-    <stroke android:width="3dip" android:color="#B1BCBE" />
+    <stroke android:width="2dip" android:color="#B1BCBE" />
     <corners android:radius="15dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
diff --git a/org.envirocar.app/res/drawable/rounded_border_warning.xml b/org.envirocar.app/res/drawable/rounded_border_warning.xml
new file mode 100644
index 000000000..0b2fbadb3
--- /dev/null
+++ b/org.envirocar.app/res/drawable/rounded_border_warning.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFDC6B"/>
+    <stroke android:width="2dip" android:color="#B1BCBE" />
+    <corners android:radius="15dip"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
diff --git a/org.envirocar.app/res/layout/dashboard.xml b/org.envirocar.app/res/layout/dashboard.xml
index 029a3de89..2cd3b0ae1 100644
--- a/org.envirocar.app/res/layout/dashboard.xml
+++ b/org.envirocar.app/res/layout/dashboard.xml
@@ -64,18 +64,6 @@
                         enviroCar:targetTextString="01234567890" />
                 </org.envirocar.app.views.LayeredImageRotateView>
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_weight="1.0" />
-
-                <ImageView
-                    android:id="@+id/connectionStateImage"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:contentDescription="@string/connection_state"
-                    android:src="@drawable/connection_state_false" />
             </LinearLayout>
 
             <org.envirocar.app.views.LayeredImageRotateView
@@ -125,29 +113,35 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_margin="15dp"
-            android:background="@drawable/rounded_border"
+            android:padding="15dp"
             android:gravity="center_horizontal|center"
-            android:orientation="vertical" >
+            android:orientation="horizontal" >
 
-            <org.envirocar.app.views.SizeRelatedTextView
-                android:id="@+id/dashboard_current_sensor_title"
+            <ImageView
+                android:id="@+id/gpsFixView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="@string/dashboard_sensor_title"
-                enviroCar:sizeRelatedPredecessingView="@+id/dashboard_general_info"
-                enviroCar:targetTextString="0123456789098765432101234567890abcdefghijklmnop" />
-
-            <org.envirocar.app.views.SizeRelatedTextView
-                android:id="@+id/dashboard_current_sensor"
+                android:layout_marginLeft="20dp"
+                android:src="@drawable/gps_nofix"
+                android:contentDescription="gps-fix"/>
+            
+            <ImageView
+                android:id="@+id/carOkView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                enviroCar:sizeRelatedPredecessingView="@+id/dashboard_general_info"
-                enviroCar:targetTextString="0123456789098765432101234567890abcdefghijklmnop" />
+                android:layout_marginLeft="20dp"
+                android:src="@drawable/car_no"
+                android:contentDescription="car-ok"/>
             
-            <View android:layout_width="0dp"
-                android:layout_height="10dp"/>
+            <ImageView
+                android:id="@+id/connectionStateImage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/connection_state"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:src="@drawable/bt_device_stopped" />
+		
         </LinearLayout>
     </LinearLayout>
 
diff --git a/org.envirocar.app/res/layout/logbook_layout.xml b/org.envirocar.app/res/layout/logbook_layout.xml
new file mode 100644
index 000000000..2bf26f2f7
--- /dev/null
+++ b/org.envirocar.app/res/layout/logbook_layout.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="bottom"
+    android:orientation="vertical" >
+
+    <Button
+        android:id="@+id/button1"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="37dp"
+        android:text="@string/store" />
+
+    <TextView
+        android:id="@+id/DistanceTravelled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/Volume"
+        android:layout_below="@+id/editTextCost"
+        android:layout_marginTop="10dp"
+        android:text="@string/mileage"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/Volume"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginBottom="10dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="10dp"
+        android:text="@string/volume"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <EditText
+        android:id="@+id/editTextVolume"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignRight="@+id/editTextCost"
+        android:layout_below="@+id/Volume"
+        android:ems="10"
+        android:hint="@string/volume"
+        android:inputType="numberDecimal" />
+
+    <EditText
+        android:id="@+id/editTextCost"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/textViewCost"
+        android:ems="10"
+        android:hint="@string/cost"
+        android:inputType="numberDecimal" />
+
+    <EditText
+        android:id="@+id/editTextDistance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignRight="@+id/editTextCost"
+        android:layout_below="@+id/DistanceTravelled"
+        android:ems="10"
+        android:hint="@string/mileage"
+        android:inputType="numberDecimal" />
+
+    <EditText
+        android:id="@+id/editTextUnit1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/editTextVolume"
+        android:layout_alignBottom="@+id/editTextVolume"
+        android:layout_alignLeft="@+id/editTextCurrency"
+        android:ems="10"
+        android:inputType="textEmailAddress" >
+
+    </EditText>
+
+    <TextView
+        android:id="@+id/textViewCurrency"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/editTextCost"
+        android:layout_alignLeft="@+id/editTextUnit1"
+        android:text="@string/currency"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <EditText
+        android:id="@+id/editTextCurrency"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/editTextCost"
+        android:layout_alignBottom="@+id/editTextCost"
+        android:layout_alignParentRight="true"
+        android:layout_toRightOf="@+id/editTextCost"
+        android:ems="10"
+        android:inputType="textEmailAddress" />
+
+    <TextView
+        android:id="@+id/textViewUnit2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/editTextDistance"
+        android:layout_alignLeft="@+id/editTextCurrency"
+        android:text="@string/unit"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <EditText
+        android:id="@+id/editTextUnit2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/editTextDistance"
+        android:layout_alignBottom="@+id/editTextDistance"
+        android:layout_alignLeft="@+id/textViewUnit2"
+        android:ems="10"
+        android:inputType="textEmailAddress" />
+
+    <TextView
+        android:id="@+id/textViewCost"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/editTextVolume"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="10dp"
+        android:text="@string/cost"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/textViewUnit1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/Volume"
+        android:layout_alignBottom="@+id/Volume"
+        android:layout_alignLeft="@+id/editTextUnit1"
+        android:text="@string/unit"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/textViewInformation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/button1"
+        android:layout_alignLeft="@+id/editTextNote"
+        android:layout_alignRight="@+id/editTextNote"
+        android:layout_marginLeft="15dp"
+        android:text="@string/logbook_information"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/textViewNote"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/editTextNote"
+        android:layout_centerVertical="true"
+        android:text="@string/comment"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <EditText
+        android:id="@+id/editTextNote"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/DistanceTravelled"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/textViewNote"
+        android:layout_marginRight="5dp"
+        android:ems="10"
+        android:inputType="textMultiLine" >
+
+        <requestFocus />
+    </EditText>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/org.envirocar.app/res/values-de/strings.xml b/org.envirocar.app/res/values-de/strings.xml
index 9f8fef7c9..91dbbdea5 100644
--- a/org.envirocar.app/res/values-de/strings.xml
+++ b/org.envirocar.app/res/values-de/strings.xml
@@ -89,7 +89,8 @@
     <string name="no">Nein</string>
 	<string name="yes">Ja</string>
 	<string name="deleteRemoteTrackQuestion">Soll die Fahrt auf dem Server gelöscht werden?</string>
-    <string name="no_sensor_selected">Kein Auto ausgewählt.</string>
+    <string name="no_sensor_selected">Kein Auto ausgewählt</string>
+    <string name="no_device_selected">Kein OBD-Adapter ausgewählt</string>
     <string name="title_create_new_sensor">Neues Fahrzeugprofil</string>
     <string name="title_select_sensor">Fahrzeug auswählen</string>
 	<string name="upload_notification">Versuche lokale Tracks hochzuladen.</string>
@@ -260,4 +261,13 @@ Bei festgestellten Problemen möchten wir Sie bitten, uns ein Fehlerprotokoll zu
 	<string name="category_normal">Wichtig</string>
 	<string name="category_high">Kritisch</string>
 	<string name="announcement">Ankündigung</string>
+	
+	<string name="store">Speichern</string>
+	<string name="mileage">Kilometerstand</string>
+	<string name="volume">Tankvolumen</string>
+	<string name="cost">Kosten</string>
+	<string name="unit">Einheit</string>
+	<string name="currency">Währung</string>
+	<string name="logbook_information">Informationen zu Zeit, Nutzer, Auto und Kraftstoff werden automatisch ermittelt</string>
+	<string name="comment">Zusätzliche Anmerkungen</string>
 </resources>
diff --git a/org.envirocar.app/res/values-de/strings_activity_settings.xml b/org.envirocar.app/res/values-de/strings_activity_settings.xml
index 84115c905..6df93601e 100644
--- a/org.envirocar.app/res/values-de/strings_activity_settings.xml
+++ b/org.envirocar.app/res/values-de/strings_activity_settings.xml
@@ -2,7 +2,8 @@
 
     <string name="title_activity_settings">Einstellungen</string>
 
-    <string name="pref_obd_settings">OBD Einstellungen</string>
+    <string name="pref_obd_settings">OBD-Einstellungen</string>
+    <string name="pref_car_settings">Fahrzeug-Einstellungen</string>
 	<string name="pref_general_settings">Allgemeine Einstellungen</string>
 	
 	<string name="pref_prompt_chose_adapter">OBD Adapter wählen</string>
@@ -22,4 +23,10 @@
     
     <string name="pref_select_car">Daten des Fahrzeugs</string>
     
+    <string name="pref_optional_features">Optionale Features</string>
+    
+    <string name="use_pid_supported">Benutze \"PID Supported\"-Abfrage</string>
+    <string name="use_pid_supported_summary">Erfrage bei der ECU des Fahrzeugs die unterstützten OBD-Befehle</string>
+
+    
 </resources>
diff --git a/org.envirocar.app/res/values/strings.xml b/org.envirocar.app/res/values/strings.xml
index a1ed3f621..a0ff10989 100644
--- a/org.envirocar.app/res/values/strings.xml
+++ b/org.envirocar.app/res/values/strings.xml
@@ -116,6 +116,7 @@
 	<string name="upload_notification">Attempting to upload local tracks.</string>
 	<string name="upload_notification_success">Successfully uploaded local tracks.</string>
 	<string name="no_sensor_selected">No Car selected</string>
+	<string name="no_device_selected">No OBD-Adapter selected</string>
 	<string name="title_create_new_sensor">New car profile</string>
 	<string name="startMap">View in map</string>
 	<string name="title_select_sensor">Select car</string>
@@ -155,6 +156,7 @@
 	<string name="privacy">Obfuscate positions</string>
 	<string name="shareTrack">Export</string>
 	<string name="error_json">Internal Error creating your JSON string</string>
+	<string name="error_io">File system error</string>
 	
 	<string name="help">Help</string>
 
@@ -264,6 +266,20 @@ If you discover and problems, please send us an error log (-> report problem). T
 	<string name="announcement">Announcement</string>
 	<string name="do_not_show_again">Do not show this message again?</string>
 	
-	<string name="ok">Ok</string>
+	<string name="ok">OK</string>
+	<string name="menu_logbook">Logbook</string>
+	
+	<string name="service_state_starting">Establishing connection to OBDII adapter</string>
+	<string name="service_state_started">Connected to OBDII adapter. Recording.</string>
+	<string name="service_state_stopped">OBDII adapter disconnected.</string>
+	
+	<string name="store">Store</string>
+	<string name="mileage">Mileage</string>
+	<string name="volume">Volume</string>
+	<string name="cost">Cost</string>
+	<string name="unit">Unit</string>
+	<string name="currency">Currency</string>
+	<string name="logbook_information">Information about the Date, User, Car and Fueltype will be obtained automatically</string>
+	<string name="comment">Additional comments</string>
 	
 </resources>
\ No newline at end of file
diff --git a/org.envirocar.app/res/values/strings_activity_settings.xml b/org.envirocar.app/res/values/strings_activity_settings.xml
index 8336dc573..664cc4764 100644
--- a/org.envirocar.app/res/values/strings_activity_settings.xml
+++ b/org.envirocar.app/res/values/strings_activity_settings.xml
@@ -2,8 +2,9 @@
 
     <string name="title_activity_settings">Settings</string>
 
-	<string name="pref_obd_settings">OBD settings</string>
-	<string name="pref_general_settings">General settings</string>
+	<string name="pref_obd_settings">OBD Settings</string>
+	<string name="pref_car_settings">Vehicle Settings</string>
+	<string name="pref_general_settings">General Settings</string>
 	
 	<string name="pref_prompt_chose_adapter">Choose OBD adapter</string>
 	<string name="pref_summary_chose_adapter">Please select an OBD adapter</string>
@@ -21,5 +22,10 @@
     <string name="pref_about">enviroCar version</string>
     
     <string name="pref_select_car">Car data</string>
+    
+    <string name="pref_optional_features">Optional Features</string>
+    
+    <string name="use_pid_supported">Use PID Supported Query</string>
+    <string name="use_pid_supported_summary">Query the vehicle\'s ECU on the supported OBD commands</string>
 	
 </resources>
\ No newline at end of file
diff --git a/org.envirocar.app/res/xml/preferences.xml b/org.envirocar.app/res/xml/preferences.xml
index 0f28a27ff..edf2bb7ce 100644
--- a/org.envirocar.app/res/xml/preferences.xml
+++ b/org.envirocar.app/res/xml/preferences.xml
@@ -8,6 +8,15 @@
             android:summary="@string/pref_summary_chose_adapter"
             android:title="@string/pref_title_chose_adapter" />
     </PreferenceCategory>
+    
+    <PreferenceCategory android:title="@string/pref_car_settings" >
+		<org.envirocar.app.activity.preference.CarSelectionPreference 
+            android:title="@string/select_car"
+            android:key="pref_selected_car"
+            android:summary="@string/pref_select_car"
+            />
+    </PreferenceCategory>    
+    
     <PreferenceCategory android:title="@string/pref_general_settings" >
         <!-- <CheckBoxPreference
             android:key="pref_auto_bluetooth"
@@ -30,12 +39,15 @@
             android:title="@string/privacy"
             android:summary="@string/track_obfuscation_on"
             android:defaultValue="true"/>
-        <org.envirocar.app.activity.preference.CarSelectionPreference 
-            android:title="@string/select_car"
-            android:key="pref_selected_car"
-            android:summary="@string/pref_select_car"
-            />
     </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_optional_features" >
+        <CheckBoxPreference
+            android:key="pref_pid_supported"
+            android:title="@string/use_pid_supported"
+            android:summary="@string/use_pid_supported_summary" />
+    </PreferenceCategory>
+    
     <PreferenceCategory android:title="@string/pref_about" >
         <Preference 
             android:key="about_version"
diff --git a/org.envirocar.app/src/org/envirocar/app/FeatureFlags.java b/org.envirocar.app/src/org/envirocar/app/FeatureFlags.java
new file mode 100644
index 000000000..0555690e5
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/FeatureFlags.java
@@ -0,0 +1,58 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+public class FeatureFlags {
+
+	/**
+	 * use PID supported query to identify 
+	 */
+	public static final String PID_SUPPORTED_KEY = "pref_pid_supported";
+	private static SharedPreferences prefs;
+	
+	public static void init(Context context) {
+		prefs = PreferenceManager.getDefaultSharedPreferences(context);
+	}
+
+	public static boolean usePIDSupported() {
+		return getFlagValue(PID_SUPPORTED_KEY);
+	}
+
+	private static boolean getFlagValue(String s) {
+		if (prefs == null) {
+			return false;
+		}
+		try {
+			return prefs.getBoolean(s, false);
+		}
+		catch (RuntimeException e) {
+		}
+		catch (Error e) {
+		}
+		
+		return false;
+	}
+	
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/activity/DashboardFragment.java b/org.envirocar.app/src/org/envirocar/app/activity/DashboardFragment.java
index fbac79dc0..a8ad96be8 100644
--- a/org.envirocar.app/src/org/envirocar/app/activity/DashboardFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/activity/DashboardFragment.java
@@ -28,9 +28,13 @@
 import org.envirocar.app.application.service.AbstractBackgroundServiceStateReceiver;
 import org.envirocar.app.application.service.BackgroundServiceImpl;
 import org.envirocar.app.application.service.AbstractBackgroundServiceStateReceiver.ServiceState;
+import org.envirocar.app.application.service.BackgroundServiceInteractor;
 import org.envirocar.app.event.CO2Event;
 import org.envirocar.app.event.CO2EventListener;
 import org.envirocar.app.event.EventBus;
+import org.envirocar.app.event.GpsSatelliteFix;
+import org.envirocar.app.event.GpsSatelliteFixEvent;
+import org.envirocar.app.event.GpsSatelliteFixEventListener;
 import org.envirocar.app.event.LocationEvent;
 import org.envirocar.app.event.LocationEventListener;
 import org.envirocar.app.event.SpeedEvent;
@@ -39,22 +43,28 @@
 import org.envirocar.app.model.Car;
 import org.envirocar.app.model.Car.FuelType;
 import org.envirocar.app.views.LayeredImageRotateView;
-import org.envirocar.app.views.SizeRelatedTextView;
 import org.envirocar.app.views.TypefaceEC;
 
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.location.Location;
 import android.os.Bundle;
+import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockFragment;
 
@@ -69,7 +79,7 @@ public class DashboardFragment extends SherlockFragment {
 
 	private static final Logger logger = Logger.getLogger(DashboardFragment.class);
 	public static final int SENSOR_CHANGED_RESULT = 1337;
-	private static final String SERVICE_STATE = "serviceState";
+//	private static final String SERVICE_STATE = "serviceState";
 	private static final String LOCATION = "location";
 	private static final String SPEED = "speed";
 	private static final String CO2 = "co2";
@@ -78,7 +88,6 @@ public class DashboardFragment extends SherlockFragment {
 	
 	TextView speedTextView;
 	TextView co2TextView;
-	private SizeRelatedTextView sensor;
 	View dashboardView;
 
 	private LocationEventListener locationListener;
@@ -97,6 +106,20 @@ public class DashboardFragment extends SherlockFragment {
 	private OnSharedPreferenceChangeListener preferenceListener;
 	private LayeredImageRotateView speedRotatableView;
 	private LayeredImageRotateView co2RotableView;
+	protected BackgroundServiceInteractor backgroundService;
+	private GpsSatelliteFixEventListener gpsFixListener;
+	private GpsSatelliteFix fix = new GpsSatelliteFix(0, false);
+	private ImageView gpsFixView;
+	private ImageView carOkView;
+	private Drawable carOkDrawable;
+	private Drawable carNotOkDrawable;
+	private Drawable gpsFix;
+	private Drawable gpsNoFix;
+	private Drawable btNotSelected;
+	private Drawable btStopped;
+	private Drawable btPending;
+	private Drawable btActive;
+	private ImageView connectionStateImage;
 
 
 	@Override
@@ -109,37 +132,35 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 	/**
 	 * Updates the sensor-textview
 	 */
-	public void updateSensorOnDashboard() {
-		//this fixes issue #166
-		sensor.setText(getCurrentSensorString());		
+	private void updateGpsStatus() {
+		if (fix.isFix()) {
+			gpsFixView.setImageDrawable(gpsFix);
+		}
+		else {
+			gpsFixView.setImageDrawable(gpsNoFix);
+		}
 	}
 	
-	/**
-	 * Returns the sensor properties as a string
-	 * @return
-	 */
-	private String getCurrentSensorString() {
+	private void updateCarStatus() {
 		if (CarManager.instance().getCar() != null) {
-			Car car = CarManager.instance().getCar();
-			return car.toString();
-		} else if (isAdded()) {//this fixes issue #166
-			return getResources().getString(R.string.no_sensor_selected);			
-		}else{
-			logger.warn("Returning empty string for getCurrentSensorString()");
-			return "";
+			carOkView.setImageDrawable(carOkDrawable);
+		}
+		else {
+			carOkView.setImageDrawable(carNotOkDrawable);
 		}
 	}
+	
 
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState) {
 		super.onViewCreated(view, savedInstanceState);
 		
+		loadCommonDrawables();
+		
 		readSavedState(savedInstanceState);
 		
 		logger.info("onViewCreated. hash="+System.identityHashCode(this));
 		
-		initializeEventListeners();
-		
 		dashboardView = getView();
 
 		preferences = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
@@ -152,7 +173,11 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
 		co2RotableView = (LayeredImageRotateView) getView().findViewById(
 				R.id.co2meterView);
 		speedRotatableView = (LayeredImageRotateView) getView().findViewById(R.id.speedometerView);
-		sensor = (SizeRelatedTextView) getView().findViewById(R.id.dashboard_current_sensor);
+		
+		/*
+		 * status images
+		 */
+		setupStatusImages();
 		
 		updateStatusElements();
 		
@@ -174,35 +199,81 @@ public void onStateChanged(ServiceState state) {
 			public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
 					String key) {
 				if (key.equals(SettingsActivity.CAR) || key.equals(SettingsActivity.CAR_HASH_CODE)) {
-					updateSensorOnDashboard();
+					updateCarStatus();
+				}
+				else if (key.equals(SettingsActivity.BLUETOOTH_KEY)) {
+					updateStatusElements();
 				}
 			}
 		};
 		
 		preferences.registerOnSharedPreferenceChangeListener(preferenceListener);
 		
+		bindToBackgroundService();
 	}
 	
 	
 
+	private void setupStatusImages() {
+		gpsFixView = (ImageView) getView().findViewById(R.id.gpsFixView);
+		
+		carOkView = (ImageView) getView().findViewById(R.id.carOkView);
+		carOkView.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Car car = CarManager.instance().getCar();
+				if (car != null) {
+					Toast.makeText(getActivity(), car.toString(), Toast.LENGTH_SHORT).show();
+				}
+				else {
+					Toast.makeText(getActivity(), R.string.no_sensor_selected, Toast.LENGTH_SHORT).show();
+				}
+			}
+		});
+		
+		connectionStateImage = (ImageView) getView().findViewById(R.id.connectionStateImage);
+		connectionStateImage.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				String remoteDevice = preferences.getString(
+						org.envirocar.app.activity.SettingsActivity.BLUETOOTH_KEY,
+						null);
+
+				if (remoteDevice == null) {
+					Toast.makeText(getActivity(), R.string.no_device_selected, Toast.LENGTH_SHORT).show();
+				}
+			}
+		});
+	}
+
+	private void loadCommonDrawables() {
+		carOkDrawable = getResources().getDrawable(R.drawable.car_ok);
+		carNotOkDrawable = getResources().getDrawable(R.drawable.car_no);
+		gpsFix = getResources().getDrawable(R.drawable.gps_fix);
+		gpsNoFix = getResources().getDrawable(R.drawable.gps_nofix);
+		btNotSelected = getResources().getDrawable(R.drawable.bt_device_not_selected);
+		btStopped = getResources().getDrawable(R.drawable.bt_device_stopped);
+		btPending = getResources().getDrawable(R.drawable.bt_device_pending);
+		btActive = getResources().getDrawable(R.drawable.bt_device_active);
+	}
+
 	@Override
 	public void onDestroy() {
 		logger.info("onDestroy. hash="+System.identityHashCode(this));
 		super.onDestroy();
 		
-		//TODO do unregistration of the receiver if and only if it was registered before
-//		getActivity().unregisterReceiver(receiver);
+		getActivity().unregisterReceiver(receiver);
+		if (preferences != null) {
+			preferences.unregisterOnSharedPreferenceChangeListener(preferenceListener);
+		}
 		
-		EventBus.getInstance().unregisterListener(this.locationListener);
-		EventBus.getInstance().unregisterListener(this.speedListener);
-		EventBus.getInstance().unregisterListener(this.co2Listener);
 	}
 	
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
 		
-		outState.putSerializable(SERVICE_STATE, serviceState);
+//		outState.putSerializable(SERVICE_STATE, serviceState);
 		outState.putParcelable(LOCATION, location);
 		outState.putInt(SPEED, speed);
 		outState.putDouble(CO2, co2);
@@ -211,12 +282,10 @@ public void onSaveInstanceState(Bundle outState) {
 	private void readSavedState(Bundle savedInstanceState) {
 		if (savedInstanceState == null) return;
 		
-		this.serviceState = (ServiceState) savedInstanceState.getSerializable(SERVICE_STATE);
+//		this.serviceState = (ServiceState) savedInstanceState.getSerializable(SERVICE_STATE);
 		this.location = savedInstanceState.getParcelable(LOCATION);
 		this.speed = savedInstanceState.getInt(SPEED);
 		this.co2 = savedInstanceState.getDouble(CO2);
-		
-		BackgroundServiceImpl.requestServiceStateBroadcast(getActivity());
 	}
 	
 	@Override
@@ -229,12 +298,38 @@ public void onStop() {
 	public void onCreate(Bundle savedInstanceState) {
 		logger.info("onCreate. hash="+System.identityHashCode(this));
 		super.onCreate(savedInstanceState);
+		
 	}
 	
+	private void bindToBackgroundService() {
+		if (!getActivity().bindService(new Intent(this.getActivity(), BackgroundServiceImpl.class),
+				new ServiceConnection() {
+					
+					@Override
+					public void onServiceDisconnected(ComponentName name) {
+						logger.info(String.format("BackgroundService %S disconnected!", name.flattenToString()));
+					}
+					
+					@Override
+					public void onServiceConnected(ComponentName name, IBinder service) {
+						backgroundService = (BackgroundServiceInteractor) service;
+						serviceState = backgroundService.getServiceState();
+						updateStatusElements();
+					}
+				}, 0)) {
+			logger.warn("Could not connect to BackgroundService.");
+		}		
+	}
+
 	@Override
 	public void onPause() {
 		logger.info("onPause. hash="+System.identityHashCode(this));
 		super.onPause();
+		
+		EventBus.getInstance().unregisterListener(this.locationListener);
+		EventBus.getInstance().unregisterListener(this.speedListener);
+		EventBus.getInstance().unregisterListener(this.co2Listener);
+		EventBus.getInstance().unregisterListener(this.gpsFixListener);
 	}
 	
 	@Override
@@ -255,13 +350,19 @@ public void onResume() {
 		logger.info("onResume. hash="+System.identityHashCode(this));
 		super.onResume();
 		
-		updateSensorOnDashboard();
+		initializeEventListeners();
+		
+		updateGpsStatus();
+		
+		updateCarStatus();
 		
 		Car car = CarManager.instance().getCar();
 		if (car != null && car.getFuelType() == FuelType.DIESEL) {
 			Crouton.makeText(getActivity(), R.string.diesel_not_yet_supported,
 					de.keyboardsurfer.android.widget.crouton.Style.ALERT).show();
 		}
+		
+		bindToBackgroundService();
 	}
 
 	private void initializeEventListeners() {
@@ -283,9 +384,16 @@ public void receiveEvent(CO2Event event) {
 				updateCO2(event.getPayload());
 			}
 		};
+		this.gpsFixListener = new GpsSatelliteFixEventListener() {
+			@Override
+			public void receiveEvent(GpsSatelliteFixEvent event) {
+				updateGpsState(event.getPayload());
+			}
+		};
 		EventBus.getInstance().registerListener(locationListener);
 		EventBus.getInstance().registerListener(speedListener);
 		EventBus.getInstance().registerListener(co2Listener);
+		EventBus.getInstance().registerListener(gpsFixListener);
 		
 		lastUIUpdate = System.currentTimeMillis();
 	}
@@ -294,6 +402,22 @@ protected void updateCO2(final Double co2) {
 		this.co2 = co2;
 		checkUIUpdate();
 	}
+	
+	protected void updateGpsState(final GpsSatelliteFix fix) {
+		if (this.fix == null || this.fix.isFix() != fix.isFix()) {
+			this.fix = fix;
+			
+			getActivity().runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					updateGpsStatus();
+				}
+			});
+		}
+		else {
+			this.fix = fix;
+		}
+	}
 
 	protected void updateSpeed(final Integer speed) {
 		this.speed = speed;
@@ -308,18 +432,23 @@ protected void updateLocation(final Location location) {
 	protected void updateStatusElements() {
 		if (getView() == null || !isAdded()) return;
 		
-		ImageView connectionStateImage = (ImageView) getView().findViewById(R.id.connectionStateImage);
-		
 		if (connectionStateImage == null) return;
 		
-		if (serviceState == ServiceState.SERVICE_STARTED) {
-			connectionStateImage.setImageResource(R.drawable.connection_state_true);
+		String remoteDevice = preferences.getString(
+				org.envirocar.app.activity.SettingsActivity.BLUETOOTH_KEY,
+				null);
+
+		if (remoteDevice == null) {
+			connectionStateImage.setImageDrawable(btNotSelected);
+		}
+		else if (serviceState == ServiceState.SERVICE_STARTED) {
+			connectionStateImage.setImageDrawable(btActive);
 		}
 		else if (serviceState == ServiceState.SERVICE_STARTING) {
-			connectionStateImage.setImageResource(R.drawable.connection_state_stale);
+			connectionStateImage.setImageDrawable(btPending);
 		}
 		else {
-			connectionStateImage.setImageResource(R.drawable.connection_state_false);
+			connectionStateImage.setImageDrawable(btStopped);
 			co2 = 0.0;
 			speed = 0;
 			updateCo2Value();
@@ -371,6 +500,6 @@ protected void updateSpeedValue() {
 			speedRotatableView.submitScaleValue(speed/1.6f);
 		}
 	}
-
+	
 
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/activity/ListTracksFragment.java b/org.envirocar.app/src/org/envirocar/app/activity/ListTracksFragment.java
index e80778a68..381bb75c6 100644
--- a/org.envirocar.app/src/org/envirocar/app/activity/ListTracksFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/activity/ListTracksFragment.java
@@ -22,9 +22,9 @@
 package org.envirocar.app.activity;
 
 import java.io.File;
+import java.io.IOException;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,11 +47,11 @@
 import org.envirocar.app.application.TermsOfUseManager;
 import org.envirocar.app.application.TrackUploadFinishedHandler;
 import org.envirocar.app.application.UploadManager;
-import org.envirocar.app.application.User;
 import org.envirocar.app.application.UserManager;
-import org.envirocar.app.dao.DAOException;
 import org.envirocar.app.dao.DAOProvider;
 import org.envirocar.app.dao.DAOProvider.AsyncExecutionWithCallback;
+import org.envirocar.app.dao.exception.DAOException;
+import org.envirocar.app.dao.exception.NotConnectedException;
 import org.envirocar.app.dao.TrackDAO;
 import org.envirocar.app.exception.FuelConsumptionException;
 import org.envirocar.app.exception.MeasurementsException;
@@ -59,7 +59,7 @@
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.model.Car;
 import org.envirocar.app.model.TermsOfUseInstance;
-import org.envirocar.app.network.RestClient;
+import org.envirocar.app.model.User;
 import org.envirocar.app.network.WPSClient;
 import org.envirocar.app.network.WPSClient.ResultCallback;
 import org.envirocar.app.protocol.algorithm.UnsupportedFuelTypeException;
@@ -71,14 +71,13 @@
 import org.envirocar.app.util.NamedThreadFactory;
 import org.envirocar.app.util.Util;
 import org.envirocar.app.views.TypefaceEC;
-import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONObject;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -101,7 +100,6 @@
 
 import com.actionbarsherlock.app.SherlockFragment;
 import com.actionbarsherlock.view.Menu;
-import com.loopj.android.http.JsonHttpResponseHandler;
 
 import de.keyboardsurfer.android.widget.crouton.Crouton;
 import de.keyboardsurfer.android.widget.crouton.Style;
@@ -208,13 +206,21 @@ public void onPrepareOptionsMenu(Menu menu) {
 	private void updateUsabilityOfMenuItems() {
 		if (menu == null) return;
 		
-		if (dbAdapter.getAllLocalTracks().size() > 0) {
-			menu.findItem(R.id.menu_delete_all).setEnabled(true);
-			menu.findItem(R.id.menu_upload).setEnabled(UserManager.instance().isLoggedIn());
-		} else {
-			menu.findItem(R.id.menu_upload).setEnabled(false);
-			menu.findItem(R.id.menu_delete_all).setEnabled(false);
-		}
+		if (!isAdded()) return;
+		
+		getActivity().runOnUiThread(new Runnable() {
+			
+			@Override
+			public void run() {
+				if (dbAdapter.getAllLocalTracks().size() > 0) {
+					menu.findItem(R.id.menu_delete_all).setEnabled(true);
+					menu.findItem(R.id.menu_upload).setEnabled(UserManager.instance().isLoggedIn());
+				} else {
+					menu.findItem(R.id.menu_upload).setEnabled(false);
+					menu.findItem(R.id.menu_delete_all).setEnabled(false);
+				}				
+			}
+		});
 	}
 	
 	/**
@@ -388,7 +394,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
 			try{
 				Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
 				sharingIntent.setType("application/json");
-				Uri shareBody = Uri.fromFile(new UploadManager(getActivity().getApplication()).saveTrackAndReturnFile(track));
+				Uri shareBody = Uri.fromFile(Util.saveTrackAndReturnFile(track, isObfuscationEnabled()));
 				sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, "EnviroCar Track "+track.getName());
 				sharingIntent.putExtra(android.content.Intent.EXTRA_STREAM,shareBody);
 				startActivity(Intent.createChooser(sharingIntent, "Share via"));
@@ -398,6 +404,9 @@ public void onClick(DialogInterface dialog, int whichButton) {
 			} catch (TrackWithoutMeasurementsException e) {
 				logger.warn(e.getMessage(), e);
 				Crouton.showText(getActivity(), R.string.track_finished_no_measurements, Style.ALERT);
+			} catch (IOException e) {
+				logger.warn(e.getMessage(), e);
+				Crouton.showText(getActivity(), R.string.error_io, Style.ALERT);
 			}
 			return true;
 			
@@ -413,6 +422,11 @@ public void onClick(DialogInterface dialog, int whichButton) {
 			return super.onContextItemSelected(item);
 		}
 	}
+	
+	public boolean isObfuscationEnabled() {
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
+		return prefs.getBoolean(SettingsActivity.OBFUSCATE_POSITION, false);
+	}
 
 	/**
 	 * starts the uploading mechanism. It asserts the Terms of Use
@@ -425,7 +439,7 @@ private void startTrackUpload(final boolean all, final Track track) {
 		final User user = UserManager.instance().getUser();
 		boolean verified = false;
 		try {
-			verified = TermsOfUseManager.verifyTermsUseOfVersion(user.getAcceptedTermsOfUseVersion());
+			verified = TermsOfUseManager.verifyTermsUseOfVersion(user.getTouVersion());
 		} catch (ServerException e) {
 			logger.warn(e.getMessage(), e);
 			Crouton.makeText(getActivity(), getString(R.string.server_error_please_try_later), Style.ALERT).show();
@@ -442,7 +456,7 @@ private void startTrackUpload(final boolean all, final Track track) {
 			}
 			
 			DialogUtil.createTermsOfUseDialog(current,
-					user.getAcceptedTermsOfUseVersion() == null, new DialogUtil.PositiveNegativeCallback() {
+					user.getTouVersion() == null, new DialogUtil.PositiveNegativeCallback() {
 
 				@Override
 				public void negative() {
@@ -661,11 +675,7 @@ protected Void doInBackground(Void... params) {
 				
 				if (UserManager.instance().isLoggedIn()) {
 					setProgressStatusText(R.string.fetching_tracks_remote);
-					User user = UserManager.instance().getUser();
-					final String username = user.getUsername();
-					final String token = user.getToken();
-					
-					downloadTracks(username, token);					
+					downloadTracks();					
 						
 				} else {
 					updateStatusLayout();
@@ -680,100 +690,69 @@ protected Void doInBackground(Void... params) {
 		
 	}
 	
-	private void downloadTracks(final String username, final String token) {
+	private void downloadTracks() {
 		
 		if (!(new ContextInternetAccessProvider(getActivity()).isConnected())) {
+			updateStatusLayout();
 			return;
 		}
 		
-		resolveTotalRemoteTrackCount(username, token, new JsonHttpResponseHandler() {
+		resolveTotalRemoteTrackCount(new AsyncExecutionWithCallback<Void>() {
+		
 			@Override
-			public void onFinish() {
-				downloadTracks(username, token, 5, 1);
+			public Void onResult(Void result, boolean fail, Exception exception) {
+				downloadTracks(5, 1);
+				return result;
+			}
+
+			@Override
+			public Void execute() throws DAOException {
+				return null;
 			}
 		});
 		
 	}
 	
-	private void resolveTotalRemoteTrackCount(String username, String token,
-			final JsonHttpResponseHandler callback) {
-		RestClient.downloadTracks(username, token, 100, 1, new JsonHttpResponseHandler() {
+	private void resolveTotalRemoteTrackCount(final AsyncExecutionWithCallback<?> callback) {
+		DAOProvider.async(new AsyncExecutionWithCallback<Integer>() {
+
 			@Override
-			public void onSuccess(int statusCode, JSONObject response) {
-				super.onSuccess(statusCode, response);
+			public Integer execute() throws DAOException {
+				return DAOProvider.instance().getTrackDAO().getUserTrackCount();
+			}
 
-				try {
-					JSONArray tracks = response.getJSONArray("tracks");
-					remoteTrackCount.set(tracks.length());
+			@Override
+			public Integer onResult(Integer result, boolean fail,
+					Exception e) {
+				if (!fail) {
+					remoteTrackCount.set(result.intValue());
 				}
-				catch (JSONException e) {
+				else {
 					logger.warn(e.getMessage(), e);
 				}
-			}
-			
-			@Override
-			public void onFinish() {
-				callback.onFinish();
+				callback.onResult(null, false, null);
+				return null;
 			}
 		});
 	}
+	
+	private void downloadTracks(final int limit, final int page) {
+		if (!UserManager.instance().isLoggedIn()) {
+			logger.info("cancelling download of tracks: not logged in.");
+		}
+		
+		DAOProvider.async(new AsyncExecutionWithCallback<List<String>>() {
 
-	private void downloadTracks(final String username, final String token, int limit, int page) {
-		RestClient.downloadTracks(username, token, limit, page, new JsonHttpResponseHandler() {
-			
 			@Override
-			public void onFailure(Throwable error, String content) {
-				super.onFailure(error, content);
-				logger.warn(content, error);
+			public List<String> execute() throws DAOException {
+				return DAOProvider.instance().getTrackDAO().getTrackIds(limit, page);
 			}
-			
-			// Variable that holds the number of trackdl requests
-			private int unprocessedTrackCount;
-			
-			protected void processDownloadedTrack(JSONObject... trackJson) {
-				
-				try {
-					Track t = Track.fromJson(trackJson[0], dbAdapter);
-					
-					synchronized (ListTracksFragment.this) {
-						tracksList.add(t);	
-					}
-					
-					afterOneTrack();
-					
-				} catch (JSONException e) {
-					logger.warn(e.getMessage(), e);
-				} catch (NumberFormatException e) {
-					logger.warn(e.getMessage(), e);
-				} catch (ParseException e) {
-					logger.warn(e.getMessage(), e);
-				}
-			}
-
-			
-			private synchronized void afterOneTrack() {
-				
-				View empty = getView().findViewById(android.R.id.empty);
-				if (empty != null) {
-					empty.setVisibility(View.GONE);
-				}
-				
-				if (--unprocessedTrackCount == 0) {
-					logger.info("Finished fetching tracks.");
-					updateStatusLayout();
-					updateTrackListView();
-					updateUsabilityOfMenuItems();
-				}
-			}
-
 
 			@Override
-			public void onSuccess(int httpStatus, JSONObject json) {
-				super.onSuccess(httpStatus, json);
-
-				try {
-					JSONArray tracks = json.getJSONArray("tracks");
-					if (tracks.length() == 0) {
+			public List<String> onResult(List<String> trackIdList, boolean fail,
+					Exception exception) {
+				if (!fail) {
+					if (trackIdList.size() == 0) {
 						updateStatusLayout();
 					}
 					
@@ -785,80 +764,73 @@ public void onSuccess(int httpStatus, JSONObject json) {
 							}
 						}	
 					}
-					
+
 					logger.info("found "+localRemoteIds.size()+" local tracks which have remoteIds.");
 					
 					List<String> tracksToDownload = new ArrayList<String>();
-					unprocessedTrackCount = tracks.length();
-					for (int i = 0; i < tracks.length(); i++) {
+					for (int i = 0; i < trackIdList.size(); i++) {
 
-						String remoteId = ((JSONObject) tracks.get(i)).getString("id");
+						String remoteId = trackIdList.get(i);
 						// check if track is listed. if, continue
 						if (localRemoteIds.contains(remoteId)) {
 							logger.info("Skipping track with remoteId "+remoteId);
-							afterOneTrack();
-							continue;
 						}
-						
-						tracksToDownload.add(remoteId);
+						else {
+							tracksToDownload.add(remoteId);
+						}
 					}
 					
 					if (!tracksToDownload.isEmpty()) {
 						logger.info("Starting download of "+ tracksToDownload.size() +" tracks");
-						final AtomicInteger index = new AtomicInteger(0);
-						downloadTrack(tracksToDownload, index);
 					}
-						
-				} catch (JSONException e) {
-					logger.warn(e.getMessage(), e);
-				}
-			}
-
-			/**
-			 * downloads a track of the list and
-			 * increments the downloadListIndex.
-			 * calls itself recursively until downloadListIndex
-			 * reaches the bounds of the list.
-			 */
-			private void downloadTrack(final List<String> downloadList,
-					final AtomicInteger downloadListIndex) {
-				
-				final String id = downloadList.get(downloadListIndex.get());
-				logger.info("downloading track with remoteId "+id);
-				
-				// download the track
-				RestClient.downloadTrack(username, token, id,
-					new JsonHttpResponseHandler() {
-						
-						@Override
-						public void onFinish() {
-							super.onFinish();
-							updateTrackListView();
-							
+					
+					for (String trackId : tracksToDownload) {
+						Track t;
+						try {
 							/*
-							 * on finish, start the next track download
+							 * we do not need async, we are still in the outer AsyncTask
 							 */
-							if (downloadListIndex.getAndIncrement() < downloadList.size()) {
-								downloadTrack(downloadList, downloadListIndex);
-							}
-						}
+							t = DAOProvider.instance().getTrackDAO().getTrack(trackId);
 
-						@Override
-						public void onSuccess(JSONObject trackJson) {
-							super.onSuccess(trackJson);
-							logger.info("Download of track " +id+ " succeeded. Processing...");
-							processDownloadedTrack(trackJson);
+							synchronized (ListTracksFragment.this) {
+								tracksList.add(t);
+							}
+							
+							updateTrackListView();
+						} catch (NotConnectedException e) {
+							logger.warn(e.getMessage(), e);
 						}
-
-						public void onFailure(Throwable arg0, String arg1) {
-							logger.warn(arg1,arg0);
-						};
 					}
-				);				
+					
+					updateStatusLayout();
+					updateUsabilityOfMenuItems();
+				}
+				else {
+					logger.warn("Could not retrieve the track ids: "+ exception.getMessage(), exception);
+				}
+				return null;
 			}
-		});			
+			
+//			private synchronized void afterOneTrack() {
+//				
+//				View empty = getView().findViewById(android.R.id.empty);
+//				if (empty != null) {
+//					empty.setVisibility(View.GONE);
+//				}
+//				
+//				if (--unprocessedTrackCount == 0) {
+//					logger.info("Finished fetching tracks.");
+//					updateStatusLayout();
+//					updateTrackListView();
+//					updateUsabilityOfMenuItems();
+//				}
+//			}
+		});
 	}
 	
+
+
+	
 	/**
 	 * This method requests the current fuel price of a given fuel type from a
 	 * WPS that caches prices from export.benzinpreis-aktuell.de, calculates the
diff --git a/org.envirocar.app/src/org/envirocar/app/activity/LogbookFragment.java b/org.envirocar.app/src/org/envirocar/app/activity/LogbookFragment.java
new file mode 100644
index 000000000..59b1d8494
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/activity/LogbookFragment.java
@@ -0,0 +1,231 @@
+package org.envirocar.app.activity;
+
+import java.util.Date;
+
+import org.envirocar.app.R;
+import org.envirocar.app.application.CarManager;
+import org.envirocar.app.dao.DAOProvider;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.exception.InvalidObjectStateException;
+import org.envirocar.app.json.FuelingEncoder;
+import org.envirocar.app.model.Fueling;
+import org.envirocar.app.model.NumberWithUOM;
+
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.SharedPreferences;
+import android.os.AsyncTask;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.actionbarsherlock.app.SherlockFragment;
+	
+public class LogbookFragment extends SherlockFragment implements OnClickListener, android.view.View.OnClickListener{
+		
+		
+		private static final String Default_Distance_Unit = "Settings_Distance_Unit";
+		private static final String Default_Volume_Unit = "Settings_Volume_Unit";
+		private static final String Default_Currency_Unit = "Settings_Currency_Unit";
+		//Used Parameter 
+		private EditText Volume,Unit1,Cost,Currency,Unit2,Distance,Note;
+		private Button btn;
+		
+		//Date and Time
+//		Calendar c = Calendar.getInstance();
+//		SimpleDateFormat df = new SimpleDateFormat("dd-MM-yyyy HH:mm");
+//		String formattedDate = df.format(c.getTime());
+		
+		
+		public View onCreateView(android.view.LayoutInflater inflater,
+				android.view.ViewGroup container,
+				android.os.Bundle savedInstanceState) {
+			super.onCreateView(inflater, container, savedInstanceState);
+			
+			setHasOptionsMenu(true);
+			
+			SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(getActivity());
+			String distanceUnit = settings.getString(Default_Distance_Unit, "km");
+			String VolumeUnit = settings.getString(Default_Volume_Unit, "Liter");
+			String CurrencyUnit = settings.getString(Default_Currency_Unit,"Euro");
+
+			View v = inflater.inflate(R.layout.logbook_layout, null);
+			//Text- and EditViews
+			Volume=(EditText)v.findViewById(R.id.editTextVolume);
+			Unit1=(EditText)v.findViewById(R.id.editTextUnit1);
+			Unit1.setText(VolumeUnit);
+			Cost=(EditText)v.findViewById(R.id.editTextCost);
+			Currency=(EditText)v.findViewById(R.id.editTextCurrency);
+			Currency.setText(CurrencyUnit);
+			Distance=(EditText)v.findViewById(R.id.editTextDistance);
+			Unit2=(EditText)v.findViewById(R.id.editTextUnit2);
+			Unit2.setText(distanceUnit);
+			Note=(EditText)v.findViewById(R.id.editTextNote);
+			
+			btn=(Button)v.findViewById(R.id.button1);
+			btn.setOnClickListener(new Button.OnClickListener()
+			{
+			//Order to create JSON-Object by pushing the Button
+				public void onClick(View v)
+				{
+					getActivity().runOnUiThread(new Runnable() {
+						@Override
+						public void run() {
+							btn.setEnabled(false);
+						}
+					});
+					createJSONFile();
+				}
+			});
+	
+			return v;
+		};
+		
+		
+		//Creating a JSON-Object
+		void createJSONFile() {
+	        
+			try {
+				SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(getActivity());
+				settings.edit().putString(Default_Distance_Unit, Unit2.getText().toString()).commit();
+				settings.edit().putString(Default_Volume_Unit, Unit1.getText().toString()).commit();
+				settings.edit().putString(Default_Currency_Unit, Currency.getText().toString()).commit();
+				
+//				String Username = UserManager.instance().getUser().getUsername();
+//				String carmodel = CarManager.instance().getCar().getModel();
+//				FuelType fueltype = CarManager.instance().getCar().getFuelType();
+				
+				Fueling fueling = new Fueling();
+				fueling.setTime(new Date());
+				
+				if (CarManager.instance().getCar() == null) {
+					throw new Exception("No car selected");
+				}
+				
+				fueling.setCar(CarManager.instance().getCar());
+				if (!Note.getText().toString().isEmpty()) {
+					fueling.setComment(Note.getText().toString());
+				}
+				
+				try {
+					fueling.setCost(new NumberWithUOM(Double.parseDouble(Cost.getText().toString()),
+							Currency.getText().toString()));
+					fueling.setVolume(new NumberWithUOM(Double.parseDouble(Volume.getText().toString()),
+							Unit1.getText().toString()));
+					fueling.setMileage(new NumberWithUOM(Double.parseDouble(Distance.getText().toString()),
+							Unit2.getText().toString()));	
+				}
+				catch (NumberFormatException e) {
+					//TODO implement some valuable user feedback
+					throw e;
+				}
+				
+//				JSONObject obj1=new JSONObject();
+//				obj1.put("DateTime:", formattedDate);
+//				obj1.put("Note:", Note.getText());
+//				JSONObject obj2=new JSONObject();
+//				obj2.put("Name:", Username );
+//				obj2.put("Car:", carmodel);
+//				obj2.put("Fueltype:",fueltype);
+//				obj1.put("User:", obj2);
+//				JSONObject obj3=new JSONObject();
+//				obj3.put("Volume:", Volume.getText());
+//				obj3.put("VolumeUnit:", Unit1.getText());
+//				obj1.put("Fuel Tank:", obj3);
+//				JSONObject obj4=new JSONObject();
+//				obj4.put("Cost:", Cost.getText());
+//				obj4.put("Currency:", Currency.getText());
+//				obj1.put("Finance:", obj4);
+//				JSONObject obj5=new JSONObject();
+//				obj5.put("Distance:", Distance.getText());
+//				obj5.put("DistanceUnit:", Unit2.getText());
+//				obj1.put("Total traveled Distance:", obj5);
+//							
+//				String str=obj1.toString();
+				//Sending the JSON-Object
+				new MyAsyncTask().execute(fueling);
+				//Log-Entry to LogCat (for Testing)
+				Log.i("JsonString :", new FuelingEncoder().createFuelingJson(fueling).toString());
+				 
+			}
+			catch (Exception je) {
+			//Exception if user is not logged in, or has not chosen a carmodel
+			makeToast("Please check if you're logged in,have chosen a car or filled in all input fields.");
+			}
+		}
+		
+		public void makeToast(final String text) {
+			getActivity().runOnUiThread(new Runnable() {
+				
+				@Override
+				public void run() {
+					Toast.makeText(LogbookFragment.this.getActivity(), text, Toast.LENGTH_LONG).show();					
+				}
+			});
+						
+		}
+			
+		private class MyAsyncTask extends AsyncTask<Fueling, Integer, Double>{
+			 
+			@Override
+			protected Double doInBackground(Fueling... params) {
+			// TODO Auto-generated method stub
+			postData(params[0]);
+			return null;
+			}
+			 
+			protected void onPostExecute(Double result){
+				makeToast("Data sent");
+			}
+			
+			 
+			public void postData(Fueling valueIWantToSend) {
+			// Create a new HttpClient and Post Header. Also HTTP-Adress from Server
+//			HttpClient httpclient = new DefaultHttpClient();
+//			HttpPost httppost = new HttpPost("http://ows.dev.52north.org/enviroCar/receiver.php");
+//			 
+//			try {
+//			// Where to add the JSON-Object (watch reciever.php also)
+//			List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>();
+//			nameValuePairs.add(new BasicNameValuePair("myHttpData", valueIWantToSend));
+//			httppost.setEntity(new UrlEncodedFormEntity(nameValuePairs));
+//			 
+//			// Execute HTTP Post Request
+//			HttpResponse response = httpclient.execute(httppost);
+//			 
+//			} catch (ClientProtocolException e) {
+//			// TODO Auto-generated catch block
+//			} catch (IOException e) {
+//			// TODO Auto-generated catch block
+//			}
+				try {
+					DAOProvider.instance().getFuelingDAO().storeFueling(valueIWantToSend);
+				} catch (NotConnectedException e) {
+					makeToast("There has been an issue while communicating with the server.");
+					
+				} catch (InvalidObjectStateException e) {
+					makeToast("Please check if you're logged in,have chosen a car or filled in all input fields.");
+				}
+			}
+			
+			 
+		}
+
+		@Override
+		public void onClick(View v) {
+			// TODO Auto-generated method stub
+			
+		}
+
+
+		@Override
+		public void onClick(DialogInterface dialog, int which) {
+			// TODO Auto-generated method stub
+			
+		}
+	 
+}	
+	
\ No newline at end of file
diff --git a/org.envirocar.app/src/org/envirocar/app/activity/LoginFragment.java b/org.envirocar.app/src/org/envirocar/app/activity/LoginFragment.java
index 3bfa3842a..65ead92a1 100644
--- a/org.envirocar.app/src/org/envirocar/app/activity/LoginFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/activity/LoginFragment.java
@@ -21,21 +21,16 @@
 
 package org.envirocar.app.activity;
 
-import java.io.IOException;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.message.BasicHeader;
 import org.envirocar.app.R;
-import org.envirocar.app.application.ECApplication;
 import org.envirocar.app.application.TermsOfUseManager;
-import org.envirocar.app.application.User;
 import org.envirocar.app.application.UserManager;
+import org.envirocar.app.dao.DAOProvider;
+import org.envirocar.app.dao.exception.UnauthorizedException;
+import org.envirocar.app.dao.exception.UserRetrievalException;
 import org.envirocar.app.logging.Logger;
-import org.envirocar.app.network.HTTPClient;
+import org.envirocar.app.model.User;
 import org.envirocar.app.views.TypefaceEC;
-import org.json.JSONException;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -213,7 +208,7 @@ private void attemptLogin() {
 			mLoginStatusMessageView.setText(R.string.login_progress_signing_in);
 			showProgress(true);
 			mAuthTask = new UserLoginTask();
-			mAuthTask.execute((Void) null);
+			mAuthTask.execute();
 		}
 	}
 
@@ -266,7 +261,6 @@ public class UserLoginTask extends AsyncTask<Void, Void, User> {
 		@Override
 		protected User doInBackground(Void... params) {
 			return authenticateHttp(mUsername, mPassword);
-
 		}
 
 		@Override
@@ -310,37 +304,37 @@ protected void onCancelled() {
 	 * credentials
 	 */
 	private User authenticateHttp(String user, String token) {
-		HttpGet httpget = new HttpGet(ECApplication.BASE_URL + "/users/" + user);
-		httpget.addHeader(new BasicHeader("X-User", user));
-		httpget.addHeader(new BasicHeader("X-Token", token));
-		HttpResponse response;
-		try {
-			response = HTTPClient.execute(httpget);
-		} catch (IOException e) {
-			logger.warn(e.getMessage(), e);
-			return null;
+		User currentUser = UserManager.instance().getUser();
+		
+		if (currentUser == null || currentUser.getToken() == null) {
+			User candidateUser = new User(user, token);
+			UserManager.instance().setUser(candidateUser);
 		}
-
-		int status = response.getStatusLine().getStatusCode();
-
-		if (status < HttpStatus.SC_MULTIPLE_CHOICES) {
-			try {
-				User u = User.fromJson(HTTPClient.readResponse(response.getEntity()));
-				if (user.equals(u.getUsername())) {
-					u.setToken(token);
+		
+		try {
+			User result = DAOProvider.instance().getUserDAO().getUser(user);
+			result.setToken(token);
+			return result;
+		} catch (UnauthorizedException e1) {
+			logger.warn(e1.getMessage(), e1);
+			getActivity().runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					mPasswordView.setError(getString(R.string.error_incorrect_password));					
 				}
-				return u;
-			} catch (JSONException e) {
-				logger.warn(e.getMessage(), e);
-			} catch (IOException e) {
-				logger.warn(e.getMessage(), e);
-			}
-		} else {
-			HTTPClient.consumeEntity(response.getEntity());
-			mPasswordView.setError(getString(R.string.error_incorrect_password));
-			return null;
+			});
+		} catch (UserRetrievalException e1) {
+			logger.warn(e1.getMessage(), e1);
+			getActivity().runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					mPasswordView.setError(getString(R.string.error_host_not_found));					
+				}
+			});
 		}
 		
+		UserManager.instance().logOut();
+		
 		return null;
 	}
 
diff --git a/org.envirocar.app/src/org/envirocar/app/activity/MainActivity.java b/org.envirocar.app/src/org/envirocar/app/activity/MainActivity.java
index 1a693d272..66de22913 100644
--- a/org.envirocar.app/src/org/envirocar/app/activity/MainActivity.java
+++ b/org.envirocar.app/src/org/envirocar/app/activity/MainActivity.java
@@ -34,12 +34,13 @@
 import org.envirocar.app.application.service.AbstractBackgroundServiceStateReceiver;
 import org.envirocar.app.application.service.AbstractBackgroundServiceStateReceiver.ServiceState;
 import org.envirocar.app.application.service.BackgroundServiceImpl;
+import org.envirocar.app.application.service.BackgroundServiceInteractor;
 import org.envirocar.app.application.service.DeviceInRangeService;
-import org.envirocar.app.dao.AnnouncementsRetrievalException;
+import org.envirocar.app.application.service.DeviceInRangeServiceInteractor;
 import org.envirocar.app.dao.DAOProvider;
+import org.envirocar.app.dao.exception.AnnouncementsRetrievalException;
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.model.Announcement;
-import org.envirocar.app.network.RestClient;
 import org.envirocar.app.storage.DbAdapterImpl;
 import org.envirocar.app.util.Util;
 import org.envirocar.app.util.VersionRange.Version;
@@ -48,9 +49,11 @@
 
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
@@ -59,6 +62,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.app.Fragment;
@@ -116,8 +120,10 @@ public class MainActivity<AndroidAlarmService> extends SherlockFragmentActivity
 	static final int MY_TRACKS = 2;
 	static final int START_STOP_MEASUREMENT = 3;
 	static final int SETTINGS = 4;
-	static final int HELP = 5;
-	static final int SEND_LOG = 6;
+	static final int LOGBOOK = 5;
+	static final int HELP = 6;
+	static final int SEND_LOG = 7;
+	
 	
 	static final String DASHBOARD_TAG = "DASHBOARD";
 	static final String LOGIN_TAG = "LOGIN";
@@ -125,6 +131,7 @@ public class MainActivity<AndroidAlarmService> extends SherlockFragmentActivity
 	static final String HELP_TAG = "HELP";
 	static final String TROUBLESHOOTING_TAG = "TROUBLESHOOTING";
 	static final String SEND_LOG_TAG = "SEND_LOG";
+	static final String LOGBOOK_TAG ="LOGBOOK";
 
 	public static final int REQUEST_MY_GARAGE = 1336;
 	public static final int REQUEST_REDIRECT_TO_GARAGE = 1337;
@@ -146,18 +153,19 @@ public class MainActivity<AndroidAlarmService> extends SherlockFragmentActivity
 	private BroadcastReceiver bluetoothStateReceiver;
 	private int trackMode = TRACK_MODE_SINGLE;
 	private Runnable remainingTimeThread;
-	private long targetTime;
 	private Handler remainingTimeHandler;
-	private BroadcastReceiver deviceInRangReceiver;
-	private boolean deviceDiscoveryActive;
 	private BroadcastReceiver errorInformationReceiver;
 	private Set<String> seenAnnouncements = new HashSet<String>();
 	private BroadcastReceiver deviceDiscoveryStateReceiver;
+	protected BackgroundServiceInteractor backgroundService;
+	protected DeviceInRangeServiceInteractor deviceInRangeService;
+	protected long discoveryTargetTime;
 		
 	private void prepareNavDrawerItems(){
 		if(this.navDrawerItems == null){
-			navDrawerItems = new NavMenuItem[7];
+			navDrawerItems = new NavMenuItem[8];
 			navDrawerItems[LOGIN] = new NavMenuItem(LOGIN, getResources().getString(R.string.menu_login),R.drawable.device_access_accounts);
+			navDrawerItems[LOGBOOK] = new NavMenuItem(LOGBOOK, getResources().getString(R.string.menu_logbook), R.drawable.logbook);
 			navDrawerItems[SETTINGS] = new NavMenuItem(SETTINGS, getResources().getString(R.string.menu_settings),R.drawable.action_settings);
 			navDrawerItems[START_STOP_MEASUREMENT] = new NavMenuItem(START_STOP_MEASUREMENT, getResources().getString(R.string.menu_start),R.drawable.av_play);
 			navDrawerItems[DASHBOARD] = new NavMenuItem(DASHBOARD, getResources().getString(R.string.dashboard), R.drawable.dashboard);
@@ -247,23 +255,9 @@ public void onStateChanged(ServiceState state) {
 				
 				if (serviceState == ServiceState.SERVICE_STOPPED && trackMode == TRACK_MODE_AUTO) {
 					/*
-					 * lets see if we need to start the DeviceInRangeService
-					 */
-					synchronized (MainActivity.this) {
-						if (!deviceDiscoveryActive) {
-							application.startDeviceDiscoveryService();
-							deviceDiscoveryActive = true;
-						}	
-					}
-					
-				}
-				else if (serviceState == ServiceState.SERVICE_STARTED ||
-						serviceState == ServiceState.SERVICE_STARTING) {
-					/*
-					 * we are currently connected, disable
-					 * deviceDiscoverey related stuff
+					 * we need to start the DeviceInRangeService
 					 */
-					deviceDiscoveryActive = false;
+					startService(new Intent(getApplicationContext(), DeviceInRangeService.class));
 				}
 				
 				updateStartStopButton();
@@ -272,20 +266,20 @@ else if (serviceState == ServiceState.SERVICE_STARTED ||
 		
 		registerReceiver(serviceStateReceiver, new IntentFilter(AbstractBackgroundServiceStateReceiver.SERVICE_STATE));
 
-		deviceDiscoveryStateReceiver = new BroadcastReceiver() {
+		deviceDiscoveryStateReceiver = new AbstractBackgroundServiceStateReceiver() {
+			
 			@Override
-			public void onReceive(Context context, Intent intent) {
-				if (intent.getAction().equals(DeviceInRangeService.STATE_CHANGE)) {
-					if (!intent.getBooleanExtra(DeviceInRangeService.STATE_CHANGE, false)) {
-						deviceDiscoveryActive = false;
-						trackMode = TRACK_MODE_SINGLE;
-						BackgroundServiceImpl.requestServiceStateBroadcast(getApplicationContext());
-						createStartStopUtil().updateStartStopButtonOnServiceStateChange(navDrawerItems[START_STOP_MEASUREMENT]);
-					}
-				}				
+			public void onStateChanged(ServiceState state) {
+				if (state == ServiceState.SERVICE_DEVICE_DISCOVERY_PENDING) {
+					discoveryTargetTime = deviceInRangeService.getNextDiscoveryTargetTime();
+					invokeRemainingTimeThread();
+				}
+				else if (state == ServiceState.SERVICE_DEVICE_DISCOVERY_RUNNING) {
+					
+				}
 			}
 		};
-		registerReceiver(deviceDiscoveryStateReceiver, new IntentFilter(DeviceInRangeService.STATE_CHANGE));
+		registerReceiver(deviceDiscoveryStateReceiver, new IntentFilter(AbstractBackgroundServiceStateReceiver.SERVICE_STATE));
 		
 		bluetoothStateReceiver = new BroadcastReceiver() {
 			@Override
@@ -294,17 +288,6 @@ public void onReceive(Context context, Intent intent) {
 			}
 		};
 		
-		deviceInRangReceiver = new BroadcastReceiver() {
-			
-			@Override
-			public void onReceive(Context context, Intent intent) {
-				targetTime = intent.getLongExtra(DeviceInRangeService.TARGET_CONNECTION_TIME, 0);
-				invokeRemainingTimeThread();
-				createStartStopUtil().updateStartStopButtonOnServiceStateChange(navDrawerItems[START_STOP_MEASUREMENT]);
-			}
-		};
-		
-		registerReceiver(deviceInRangReceiver, new IntentFilter(DeviceInRangeService.TARGET_CONNECTION_TIME));
 		
 		registerReceiver(bluetoothStateReceiver, new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
 		
@@ -341,6 +324,8 @@ public void onReceive(Context context, Intent intent) {
 		registerReceiver(errorInformationReceiver, new IntentFilter(TroubleshootingFragment.INTENT));
 		
 		resolvePersistentSeenAnnouncements();
+		
+		
 	}
 	
 	private void readSavedState(Bundle savedInstanceState) {
@@ -355,8 +340,50 @@ private void readSavedState(Bundle savedInstanceState) {
 				this.seenAnnouncements.add(string);
 			}
 		}
-		
-		BackgroundServiceImpl.requestServiceStateBroadcast(getApplicationContext());
+	}
+	
+	private void bindToBackgroundService() {
+		if (!bindService(new Intent(this, BackgroundServiceImpl.class),
+				new ServiceConnection() {
+					
+					@Override
+					public void onServiceDisconnected(ComponentName name) {
+						logger.info(String.format("BackgroundService %S disconnected!", name.flattenToString()));
+					}
+					
+					@Override
+					public void onServiceConnected(ComponentName name, IBinder service) {
+						backgroundService = (BackgroundServiceInteractor) service;
+						serviceState = backgroundService.getServiceState();
+						updateStartStopButton();
+					}
+				}, 0)) {
+			logger.warn("Could not connect to BackgroundService.");
+		}		
+	}
+	
+	private void bindToDeviceInRangeService() {
+		if (!bindService(new Intent(this, DeviceInRangeService.class),
+				new ServiceConnection() {
+					
+					@Override
+					public void onServiceDisconnected(ComponentName name) {
+						logger.info(String.format("DeviceInRangeService %S disconnected!", name.flattenToString()));
+					}
+					
+					@Override
+					public void onServiceConnected(ComponentName name, IBinder service) {
+						deviceInRangeService = (DeviceInRangeServiceInteractor) service;
+						if (deviceInRangeService.isDiscoveryPending()) {
+							serviceState = ServiceState.SERVICE_DEVICE_DISCOVERY_PENDING;
+						}
+						updateStartStopButton();
+						discoveryTargetTime = deviceInRangeService.getNextDiscoveryTargetTime();
+						invokeRemainingTimeThread();
+					}
+				}, 0)) {
+			logger.warn("Could not connect to DeviceInRangeService.");
+		}		
 	}
 	
 	@Override
@@ -387,15 +414,15 @@ false, R.drawable.not_available, getString(R.string.pref_bluetooth_disabled),
 	 * discovered
 	 */
 	private void invokeRemainingTimeThread() {
-		if (remainingTimeThread == null || targetTime > System.currentTimeMillis()) {
+		if (remainingTimeThread == null || discoveryTargetTime > System.currentTimeMillis()) {
 			remainingTimeHandler = new Handler();
 			remainingTimeThread = new Runnable() {
 				@Override
 				public void run() {
-					final long deltaSec = (targetTime - System.currentTimeMillis()) / 1000;
+					final long deltaSec = (discoveryTargetTime - System.currentTimeMillis()) / 1000;
 					final long minutes = deltaSec / 60;
 					final long secs = deltaSec - (minutes*60);
-					if (deviceDiscoveryActive && deltaSec > 0) {
+					if (serviceState == ServiceState.SERVICE_DEVICE_DISCOVERY_PENDING && deltaSec > 0) {
 						runOnUiThread(new Runnable() {
 							@Override
 							public void run() {
@@ -406,6 +433,10 @@ public void run() {
 								navDrawerAdapter.notifyDataSetChanged();
 							}
 						});
+						
+						/*
+						 * re-invoke the painting
+						 */
 						remainingTimeHandler.postDelayed(remainingTimeThread, 1000);
 					} else {
 						logger.info("NOT SHOWING!");
@@ -414,6 +445,10 @@ public void run() {
 			};
 			remainingTimeHandler.post(remainingTimeThread);
 		}
+		else {
+			logger.info("not invoking the discovery time painting thread: "+
+					(remainingTimeThread == null) +", "+ (discoveryTargetTime - System.currentTimeMillis()));
+		}
 	}
 
 
@@ -498,7 +533,6 @@ private void openFragment(int position) {
         case LOGIN:
         	if(UserManager.instance().isLoggedIn()){
         		UserManager.instance().logOut();
-        		RestClient.removeUserSpecificHeaders();
     			ListTracksFragment listMeasurementsFragment = (ListTracksFragment) getSupportFragmentManager().findFragmentByTag("MY_TRACKS");
     			// check if this fragment is initialized
     			if (listMeasurementsFragment != null) {
@@ -584,6 +618,15 @@ public void onTrackModeChange(int tm) {
 			manager.beginTransaction().replace(R.id.content_frame, logFragment, SEND_LOG_TAG).addToBackStack(null).commit();
         default:
             break;
+            
+		case LOGBOOK:
+        	
+        	if(isFragmentVisible(LOGBOOK_TAG)){
+            	break;
+            }
+			LogbookFragment logbookFragment = new LogbookFragment();
+            manager.beginTransaction().replace(R.id.content_frame, logbookFragment, LOGBOOK_TAG).addToBackStack(null).commit();
+			break;
         }
         drawer.closeDrawer(drawerList);
 
@@ -592,7 +635,8 @@ public void onTrackModeChange(int tm) {
 
     	
 	private StartStopButtonUtil createStartStopUtil() {
-		return new StartStopButtonUtil(application, this, trackMode, serviceState, deviceDiscoveryActive);
+		return new StartStopButtonUtil(application, this, trackMode, serviceState,
+				serviceState == ServiceState.SERVICE_DEVICE_DISCOVERY_PENDING);
 	}
 
 	/**
@@ -615,6 +659,14 @@ public boolean isFragmentVisible(String tag){
 	protected void onDestroy() {
 		super.onDestroy();
 
+//		new AsyncTask<Void, Void, Void>() {
+//			@Override
+//			protected Void doInBackground(Void... params) {
+//				HTTPClient.shutdown();
+//				return null;
+//			}
+//		}.execute();
+		
 		// Close db connection
 
 //		application.closeDb();
@@ -627,6 +679,16 @@ protected void onDestroy() {
 		
 //		this.unregisterReceiver(application.getBluetoothChangeReceiver());
 
+		this.unregisterReceiver(bluetoothStateReceiver);
+		this.unregisterReceiver(deviceDiscoveryStateReceiver);
+		this.unregisterReceiver(errorInformationReceiver);
+		this.unregisterReceiver(serviceStateReceiver);
+		
+		if (remainingTimeHandler != null) {
+			remainingTimeHandler.removeCallbacks(remainingTimeThread);
+			discoveryTargetTime = 0;
+			remainingTimeThread = null;
+		}
 	}
 	
 	@Override
@@ -652,6 +714,9 @@ protected Void doInBackground(Void... params) {
 			}
 		}.execute();
         
+		bindToBackgroundService();
+		
+		bindToDeviceInRangeService();
 	}
 
 
diff --git a/org.envirocar.app/src/org/envirocar/app/activity/RegisterFragment.java b/org.envirocar.app/src/org/envirocar/app/activity/RegisterFragment.java
index 2c3e0e923..698567426 100644
--- a/org.envirocar.app/src/org/envirocar/app/activity/RegisterFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/activity/RegisterFragment.java
@@ -21,30 +21,20 @@
 
 package org.envirocar.app.activity;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.protocol.HTTP;
 import org.envirocar.app.R;
-import org.envirocar.app.application.ECApplication;
 import org.envirocar.app.application.TermsOfUseManager;
-import org.envirocar.app.application.User;
 import org.envirocar.app.application.UserManager;
+import org.envirocar.app.dao.DAOProvider;
+import org.envirocar.app.dao.exception.ResourceConflictException;
+import org.envirocar.app.dao.exception.UserUpdateException;
 import org.envirocar.app.logging.Logger;
-import org.envirocar.app.network.HTTPClient;
+import org.envirocar.app.model.User;
 import org.envirocar.app.views.TypefaceEC;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
@@ -72,8 +62,6 @@ public class RegisterFragment extends SherlockFragment {
 	
 	private static final Logger logger = Logger.getLogger(RegisterFragment.class);
 
-	private static final int ERROR_GENERAL = 1;
-	private static final int ERROR_NET = 2;
 
 	/**
 	 * Keep track of the register task to ensure we can cancel it if requested.
@@ -284,102 +272,76 @@ public void onAnimationEnd(Animator animation) {
 	 * Represents an asynchronous register/registration task used to
 	 * authenticate the user.
 	 */
-	public class UserRegisterTask extends AsyncTask<Void, Void, Integer> {
+	public class UserRegisterTask extends AsyncTask<Void, Void, Void> {
 		@Override
-		protected Integer doInBackground(Void... params) {
-
-			return createUser(mUsername, mPassword, mEmail);
-
-		}
-
-		@Override
-		protected void onPostExecute(final Integer httpStatus) {
-			mAuthTask = null;
-			showProgress(false);
-
-			if (httpStatus == HttpStatus.SC_CREATED) {
-				Crouton.makeText(getActivity(), getResources().getString(R.string.welcome_message)+mUsername, Style.CONFIRM).show();
-				User user = new User(mUsername, mPassword);
-				UserManager.instance().setUser(user);
-				
-				TermsOfUseManager.askForTermsOfUseAcceptance(user, getActivity(), null);
+		protected Void doInBackground(Void... params) {
+			try {
+				createUser(mUsername, mPassword, mEmail);
 				
-				getActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-				DashboardFragment dashboardFragment = new DashboardFragment();
-				getActivity().getSupportFragmentManager().beginTransaction()
-						.replace(R.id.content_frame, dashboardFragment)
-						.commit();
+				getActivity().runOnUiThread(new Runnable() {
+					@Override
+					public void run() {
+						Crouton.makeText(getActivity(), getResources().getString(R.string.welcome_message)+mUsername, Style.CONFIRM).show();
+						User user = new User(mUsername, mPassword);
+						UserManager.instance().setUser(user);
+						
+						TermsOfUseManager.askForTermsOfUseAcceptance(user, getActivity(), null);
+						
+						getActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+						DashboardFragment dashboardFragment = new DashboardFragment();
+						getActivity().getSupportFragmentManager().beginTransaction()
+								.replace(R.id.content_frame, dashboardFragment)
+								.commit();						
+					}
+				});
+			} catch (UserUpdateException e) {
+				logger.warn(e.getMessage(), e);
+				getActivity().runOnUiThread(new Runnable() {
+
+					@Override
+					public void run() {
+						mUsernameView.setError(getString(R.string.error_host_not_found));
+						mUsernameView.requestFocus();
+						showProgress(false);						
+					}
+					
+				});
 				
-			} else if (httpStatus == HttpStatus.SC_FORBIDDEN) {
-                AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
-                alertDialogBuilder.setTitle("Sorry");
-                alertDialogBuilder
-                        .setMessage(R.string.error_email_not_in_beta)
-                        .setCancelable(false)
-                        .setPositiveButton(android.R.string.ok,
-                                new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog,
-                                            int id) {
-                                        dialog.cancel();
-                                    }
-                                });
-                AlertDialog alertDialog = alertDialogBuilder.create();
-                alertDialog.show();
-			} else if (httpStatus == HttpStatus.SC_CONFLICT) {
-				// TODO look out for server changes..
-				mUsernameView.setError(getString(R.string.error_username_already_in_use));
-				mEmailView.setError(getString(R.string.error_email_already_in_use));
-				mUsernameView.requestFocus();				
-			} else if (httpStatus==ERROR_NET){
-				mUsernameView.setError(getString(R.string.error_host_not_found));
-				mUsernameView.requestFocus();
+			} catch (ResourceConflictException e) {
+				logger.warn(e.getMessage(), e);
+				getActivity().runOnUiThread(new Runnable() {
+					@Override
+					public void run() {
+						// TODO look out for server changes..
+						mUsernameView.setError(getString(R.string.error_username_already_in_use));
+						mEmailView.setError(getString(R.string.error_email_already_in_use));
+						mUsernameView.requestFocus();
+						showProgress(false);						
+					}
+				});
 			}
+			
+			return null;
 		}
-
+		
 		@Override
-		protected void onCancelled() {
-			mAuthTask = null;
-			showProgress(false);
+		protected void onPostExecute(Void result) {
+			super.onPostExecute(result);
 		}
+		
+		
+
 	}
 
 	/*
 	 * Use this method to sign up a new user
 	 */
-	public int createUser(String user, String token, String mail) {
-
-		JSONObject requestJson = new JSONObject();
-		try {
-			requestJson.put("name", user);
-			requestJson.put("token", token);
-			requestJson.put("mail", mail);
-		} catch (JSONException e) {
-			logger.warn(e.getMessage(), e);
-		}
-
-
-		try {
-			HttpPost postRequest = new HttpPost(
-					ECApplication.BASE_URL+"/users");
-					
-
-			StringEntity input = new StringEntity(requestJson.toString(),
-					HTTP.UTF_8);
-			input.setContentType("application/json");
-
-			postRequest.setEntity(input);
-			return HTTPClient.execute(postRequest).getStatusLine()
-					.getStatusCode();
-
-		} catch (UnsupportedEncodingException e) {
-			// Shouldn't occur hopefully..
-			logger.warn(e.getMessage(), e);
-			return ERROR_GENERAL;
-		} catch (IOException e) {
-			logger.warn(e.getMessage(), e);
-			// probably something with the Internet..
-			return ERROR_NET;
-		}
+	public boolean createUser(String user, String token, String mail) throws UserUpdateException, ResourceConflictException {
+		User newUser = new User(user, token);
+		newUser.setMail(mail);
+		
+		DAOProvider.instance().getUserDAO().createUser(newUser);
+		return true;
 	}
 
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/activity/StartStopButtonUtil.java b/org.envirocar.app/src/org/envirocar/app/activity/StartStopButtonUtil.java
index ae3ee9351..7361580f7 100644
--- a/org.envirocar.app/src/org/envirocar/app/activity/StartStopButtonUtil.java
+++ b/org.envirocar.app/src/org/envirocar/app/activity/StartStopButtonUtil.java
@@ -26,6 +26,7 @@
 import org.envirocar.app.application.ECApplication;
 import org.envirocar.app.application.NavMenuItem;
 import org.envirocar.app.application.service.AbstractBackgroundServiceStateReceiver.ServiceState;
+import org.envirocar.app.application.service.BackgroundServiceImpl;
 import org.envirocar.app.application.service.DeviceInRangeService;
 import org.envirocar.app.logging.Logger;
 
@@ -51,7 +52,7 @@ public class StartStopButtonUtil {
 	
 	private ECApplication application;
 	private int trackMode;
-	private ServiceState serviceState;
+	private ServiceState serviceState = ServiceState.SERVICE_STOPPED;
 	private Activity activity;
 	private boolean deviceDiscoveryActive;
 	
@@ -173,7 +174,8 @@ public void positive() {
 						new AsyncTask<Void, Void, Void>() {
 							@Override
 							protected Void doInBackground(Void... params) {
-								application.stopConnection();
+								application.getApplicationContext().stopService(
+										new Intent(application, BackgroundServiceImpl.class));
 								application.finishTrack();
 								return null;
 							}
@@ -200,13 +202,16 @@ public void itemSelected(int which) {
 						switch (which) {
 							case 0:
 								listener.onTrackModeChange(MainActivity.TRACK_MODE_SINGLE);
+								application.getApplicationContext().startService(
+										new Intent(application, BackgroundServiceImpl.class));
 								break;
 							case 1:
 								listener.onTrackModeChange(MainActivity.TRACK_MODE_AUTO);
+								application.getApplicationContext().startService(
+										new Intent(application, DeviceInRangeService.class));
 								break;
 						}
 						
-						application.startConnection();
 						Crouton.makeText(activity, R.string.start_connection, Style.INFO).show();
 					}
 					
@@ -295,13 +300,13 @@ private void processPendingStateClick() {
 		/*
 		 * this broadcast stops the DeviceInRangeService
 		 */
-		Intent intent = new Intent(DeviceInRangeService.STATE_CHANGE);
-		intent.putExtra(DeviceInRangeService.STATE_CHANGE, false);
-		activity.sendBroadcast(intent);
+		application.getApplicationContext().stopService(
+				new Intent(application.getApplicationContext(), DeviceInRangeService.class));
 	}
 	
 	private void processStartingStateClick() {
-		application.stopConnection();
+		application.getApplicationContext().stopService(
+				new Intent(application, BackgroundServiceImpl.class));
 		Crouton.makeText(activity, R.string.stop_connection, Style.INFO).show();		
 	}
 
diff --git a/org.envirocar.app/src/org/envirocar/app/activity/preference/CarSelectionPreference.java b/org.envirocar.app/src/org/envirocar/app/activity/preference/CarSelectionPreference.java
index 1cda08f8d..b18b2ffb1 100644
--- a/org.envirocar.app/src/org/envirocar/app/activity/preference/CarSelectionPreference.java
+++ b/org.envirocar.app/src/org/envirocar/app/activity/preference/CarSelectionPreference.java
@@ -36,8 +36,9 @@
 import org.envirocar.app.application.ContextInternetAccessProvider;
 import org.envirocar.app.application.UserManager;
 import org.envirocar.app.dao.DAOProvider;
-import org.envirocar.app.dao.NotConnectedException;
-import org.envirocar.app.dao.SensorRetrievalException;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.SensorRetrievalException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.model.Car;
 import org.envirocar.app.model.Car.FuelType;
@@ -306,6 +307,15 @@ public void run() {
 								changeProgress(false, e1.getMessage());								
 							}
 						});
+					} catch (final UnauthorizedException e1) {
+						logger.warn(e1.getMessage());
+						runOnUiThread(new Runnable() {
+							@Override
+							public void run() {
+								Toast.makeText(getContext(), "Server Error: "+e1.getMessage(), Toast.LENGTH_SHORT).show();
+								changeProgress(false, e1.getMessage());								
+							}
+						});
 					}
 					
 					return null;
diff --git a/org.envirocar.app/src/org/envirocar/app/application/Collector.java b/org.envirocar.app/src/org/envirocar/app/application/Collector.java
index f0d411c89..b82c5f00f 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/Collector.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/Collector.java
@@ -49,6 +49,7 @@ public class Collector {
 	private Car car;
 	private AbstractCalculatedMAFAlgorithm mafAlgorithm;
 	private AbstractConsumptionAlgorithm consumptionAlgorithm;
+	private boolean fuelTypeNotSupportedLogged;
 	
 	public Collector(MeasurementListener l, Car car) {
 		this.callback = l;
@@ -133,7 +134,10 @@ private void fireConsumptionEvent() {
 		} catch (FuelConsumptionException e) {
 			logger.warn(e.getMessage());
 		} catch (UnsupportedFuelTypeException e) {
-			logger.warn(e.getMessage());
+			if (!fuelTypeNotSupportedLogged) {
+				logger.warn(e.getMessage());
+				fuelTypeNotSupportedLogged = true;
+			}
 		}
 		
 	}
@@ -192,7 +196,10 @@ private void checkStateAndPush() {
 			} catch (FuelConsumptionException e) {
 				logger.warn(e.getMessage());
 			} catch (UnsupportedFuelTypeException e) {
-				logger.warn(e.getMessage());
+				if (!fuelTypeNotSupportedLogged) {
+					logger.warn(e.getMessage());
+					fuelTypeNotSupportedLogged = true;
+				}
 			}
 			
 			/*
diff --git a/org.envirocar.app/src/org/envirocar/app/application/CommandListener.java b/org.envirocar.app/src/org/envirocar/app/application/CommandListener.java
index f48ba1ba0..901841c45 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/CommandListener.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/CommandListener.java
@@ -129,7 +129,7 @@ public void receiveUpdate(CommonCommand command) {
 				Integer speedMeasurement = (Integer) numberCommand.getNumberResult();
 				this.collector.newSpeed(speedMeasurement);
 				EventBus.getInstance().fireEvent(new SpeedEvent(speedMeasurement));
-				logger.info("Processed Speed Response: "+speedMeasurement +" time: "+command.getResultTime());
+//				logger.info("Processed Speed Response: "+speedMeasurement +" time: "+command.getResultTime());
 			} catch (NumberFormatException e) {
 				logger.warn("speed parse exception", e);
 			}
@@ -146,7 +146,7 @@ else if (command instanceof RPM) {
 				Integer rpmMeasurement = (Integer) numberCommand.getNumberResult();
 				this.collector.newRPM(rpmMeasurement);
 				EventBus.getInstance().fireEvent(new RPMEvent(rpmMeasurement));
-				logger.info("Processed RPM Response: "+rpmMeasurement +" time: "+command.getResultTime());
+//				logger.info("Processed RPM Response: "+rpmMeasurement +" time: "+command.getResultTime());
 			} catch (NumberFormatException e) {
 				logger.warn("rpm parse exception", e);
 			}
@@ -163,7 +163,7 @@ else if (command instanceof IntakePressure) {
 				Integer intakePressureMeasurement = (Integer) numberCommand.getNumberResult();
 				this.collector.newIntakePressure(intakePressureMeasurement);
 				EventBus.getInstance().fireEvent(new IntakePressureEvent(intakePressureMeasurement));
-				logger.info("Processed IAP Response: "+intakePressureMeasurement +" time: "+command.getResultTime());
+//				logger.info("Processed IAP Response: "+intakePressureMeasurement +" time: "+command.getResultTime());
 			} catch (NumberFormatException e) {
 				logger.warn("Intake Pressure parse exception", e);
 			}
@@ -180,7 +180,7 @@ else if (command instanceof IntakeTemperature) {
 				Integer intakeTemperatureMeasurement = (Integer) numberCommand.getNumberResult();
 				this.collector.newIntakeTemperature(intakeTemperatureMeasurement);
 				EventBus.getInstance().fireEvent(new IntakeTemperatureEvent(intakeTemperatureMeasurement));
-				logger.info("Processed IAT Response: "+intakeTemperatureMeasurement +" time: "+command.getResultTime());
+//				logger.info("Processed IAT Response: "+intakeTemperatureMeasurement +" time: "+command.getResultTime());
 			} catch (NumberFormatException e) {
 				logger.warn("Intake Temperature parse exception", e);
 			}
@@ -189,42 +189,42 @@ else if (command instanceof IntakeTemperature) {
 		else if (command instanceof MAF) {
 			float mafMeasurement = (Float) numberCommand.getNumberResult();
 			this.collector.newMAF(mafMeasurement);
-			logger.info("Processed MAF Response: "+mafMeasurement +" time: "+command.getResultTime());
+//			logger.info("Processed MAF Response: "+mafMeasurement +" time: "+command.getResultTime());
 		}
 		
 		
 		else if (command instanceof TPS) {
 			int tps = (Integer) numberCommand.getNumberResult();
 			this.collector.newTPS(tps);
-			logger.info("Processed TPS Response: "+tps +" time: "+command.getResultTime());
+//			logger.info("Processed TPS Response: "+tps +" time: "+command.getResultTime());
 		}
 
 		else if (command instanceof EngineLoad) {
 			double load = (Float) numberCommand.getNumberResult();
 			this.collector.newEngineLoad(load);
-			logger.info("Processed EngineLoad Response: "+load +" time: "+command.getResultTime());
+//			logger.info("Processed EngineLoad Response: "+load +" time: "+command.getResultTime());
 		}
 		
 		else if (command instanceof FuelSystemStatus) {
 			boolean loop = ((FuelSystemStatus) command).isInClosedLoop();
 			int status = ((FuelSystemStatus) command).getStatus();
 			this.collector.newFuelSystemStatus(loop, status);
-			logger.info("Processed FuelSystemStatus Response: Closed? "+loop +" Status: "+ status +"; time: "+command.getResultTime());
+//			logger.info("Processed FuelSystemStatus Response: Closed? "+loop +" Status: "+ status +"; time: "+command.getResultTime());
 		}
 		
 		else if (command instanceof O2LambdaProbe) {
 			this.collector.newLambdaProbeValue((O2LambdaProbe) command);
-			logger.info("Processed O2LambdaProbe Response: "+ command.toString());
+//			logger.info("Processed O2LambdaProbe Response: "+ command.toString());
 		}
 		
 		else if (command instanceof ShortTermTrimBank1) {
 			this.collector.newShortTermTrimBank1(((ShortTermTrimBank1) command).getNumberResult());
-			logger.info("Processed ShortTermTrimBank1: "+ command.toString());
+//			logger.info("Processed ShortTermTrimBank1: "+ command.toString());
 		}
 		
 		else if (command instanceof LongTermTrimBank1) {
 			this.collector.newLongTermTrimBank1(((LongTermTrimBank1) command).getNumberResult());
-			logger.info("Processed LongTermTrimBank1: "+ command.toString());
+//			logger.info("Processed LongTermTrimBank1: "+ command.toString());
 		}
 	}
 	
diff --git a/org.envirocar.app/src/org/envirocar/app/application/ECApplication.java b/org.envirocar.app/src/org/envirocar/app/application/ECApplication.java
index 8bfaa7992..6d53da9b0 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/ECApplication.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/ECApplication.java
@@ -27,13 +27,10 @@
 
 import org.acra.ACRA;
 import org.acra.annotation.ReportsCrashes;
+import org.envirocar.app.FeatureFlags;
 import org.envirocar.app.R;
 import org.envirocar.app.activity.MainActivity;
 import org.envirocar.app.activity.SettingsActivity;
-import org.envirocar.app.application.service.AbstractBackgroundServiceStateReceiver;
-import org.envirocar.app.application.service.BackgroundServiceImpl;
-import org.envirocar.app.application.service.BackgroundServiceConnector;
-import org.envirocar.app.application.service.DeviceInRangeService;
 import org.envirocar.app.dao.CacheDirectoryProvider;
 import org.envirocar.app.dao.DAOProvider;
 import org.envirocar.app.logging.ACRACustomSender;
@@ -51,14 +48,11 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.bluetooth.BluetoothAdapter;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
-import android.widget.Toast;
 
 /**
  * This is the main application that is the central linking component for all adapters, services and so on.
@@ -74,8 +68,7 @@ public class ECApplication extends Application {
 	// Strings
 	
 	public static final String BASE_URL = "https://envirocar.org/api/stable";
-//	public static final String BASE_URL = "https://giv-car.uni-muenster.de/dev/rest";
-//	public static final String BASE_URL = "http://192.168.1.142:8080/webapp-1.1.0-SNAPSHOT/rest";
+//	public static final String BASE_URL = "http://192.168.1.148:8080/webapp-1.1.0-SNAPSHOT";
 
 	private SharedPreferences preferences = null;
 	
@@ -88,38 +81,11 @@ public class ECApplication extends Application {
 	private BluetoothAdapter bluetoothAdapter = BluetoothAdapter
 			.getDefaultAdapter();
 
-	private BackgroundServiceConnector serviceConnector;
-	private Intent backgroundService;
-	private Intent deviceInRangeService;
-	
 	private int mId = 1133;
 	
 	protected boolean adapterConnected;
 	private Activity currentActivity;
 	
-	private final BroadcastReceiver bluetoothChangeReceiver = new BroadcastReceiver() {
-	    @Override
-	    public void onReceive(Context context, Intent intent) {
-	        final String action = intent.getAction();
-
-	        if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
-	            final int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
-	                                                 BluetoothAdapter.ERROR);
-	            switch (state) {
-	            case BluetoothAdapter.STATE_ON:
-	            	logger.info("bt is now on");
-	            	initializeBackgroundServices();
-	                break;
-	            }
-	        }
-	        else if (action.equals(DeviceInRangeService.DEVICE_FOUND)) {
-	        	logger.info("our device got discovered!");
-	        	startConnection();
-	        }
-	    }
-	};
-
-	private BroadcastReceiver receiver;
 
 
 	/**
@@ -135,16 +101,6 @@ public void setActivity(Activity a){
 		this.currentActivity = a;
 	}
 	
-	/**
-	 * Returns the service connector of the server
-	 * @return the serviceConnector
-	 */
-	public BackgroundServiceConnector getServiceConnector() {
-		if (serviceConnector == null)
-			initializeBackgroundServices();
-		return serviceConnector;
-	}
-	
 	/**
 	 * Returns whether requirements were fulfilled (bluetooth activated)
 	 * @return requirementsFulfilled?
@@ -183,6 +139,9 @@ public File getBaseFolder() {
 				});
 		
 		UserManager.init(getApplicationContext());
+		
+		FeatureFlags.init(getApplicationContext());
+		
 		initializeErrorHandling();
 		CarManager.init(preferences);
 		TermsOfUseManager.instance();
@@ -191,16 +150,8 @@ public File getBaseFolder() {
 		// returned
 		logger.info("init commandListener");
 		
-		// If everything is available, start the service connector and commandListener
-		initializeBackgroundServices();
-		
-		//bluetooth change commandListener
-	    registerReceiver(bluetoothChangeReceiver, new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
-	    registerReceiver(bluetoothChangeReceiver, new IntentFilter(DeviceInRangeService.DEVICE_FOUND));
-
 	}
 	
-	
 	private void initializeErrorHandling() {
 		ACRA.init(this);
 		ACRACustomSender yourSender = new ACRACustomSender();
@@ -208,56 +159,6 @@ private void initializeErrorHandling() {
 		ACRA.getConfig().setExcludeMatchingSharedPreferencesKeys(SettingsActivity.resolveIndividualKeys());
 	}
 
-	/**
-	 * This method opens both dbadapters or also gets them and opens them afterwards.
-	 */
-
-
-	/**
-	 * This method starts the service that connects to the adapter to the app.
-	 */
-	private void initializeBackgroundServices() {
-		if (bluetoothActivated()) {
-			logger.info("requirements met");
-			
-			backgroundService = new Intent(this, BackgroundServiceImpl.class);
-			serviceConnector = new BackgroundServiceConnector();
-			bindService(backgroundService, serviceConnector,
-					Context.BIND_AUTO_CREATE);
-			
-			receiver = new BroadcastReceiver() {
-				@Override
-				public void onReceive(Context context, Intent intent) {
-					if (intent.getAction().equals(BackgroundServiceImpl.CONNECTION_PERMANENTLY_FAILED_INTENT)) {
-						connectionPermanentlyFailed();
-					}
-				}
-			};
-			
-			registerReceiver(receiver, new IntentFilter(BackgroundServiceImpl.CONNECTION_PERMANENTLY_FAILED_INTENT));
-
-			registerReceiver(new AbstractBackgroundServiceStateReceiver() {
-				@Override
-				public void onStateChanged(ServiceState state) {
-					switch (state) {
-					case SERVICE_STARTED:
-						onAdapterConnected();
-						break;
-					case SERVICE_STOPPED:
-						onAdapterDisconnected();
-						break;
-					default:
-						break;
-					}
-				}
-			}, new IntentFilter(AbstractBackgroundServiceStateReceiver.SERVICE_STATE));
-		} else {
-			logger.warn("bluetooth not activated!");
-		}
-	}
-
-	
-
 	/**
 	 * Stop the service connector and therefore the scheduled tasks.
 	 */
@@ -265,37 +166,6 @@ public void shutdownServiceConnector() {
 		scheduleTaskExecutor.shutdown();
 	}
 
-	/**
-	 * Connects to the Bluetooth Adapter and starts the execution of the
-	 * commands. this method does not do a sanity check - callers must
-	 * verify the state of the service (e.g. through {@link AbstractBackgroundServiceStateReceiver}.)
-	 */
-	public void startConnection() {
-		logger.info("ECApplication startConnection");
-		startService(backgroundService);
-	}
-
-	/**
-	 * Ends the connection with the Bluetooth Adapter. also stops gps and closes the db.
-	 * this method does not do a sanity check - callers must
-	 * verify the state of the service (e.g. through {@link AbstractBackgroundServiceStateReceiver}.)
-	 */
-	public void stopConnection() {
-		logger.info("ECApplication stopConnection");
-		if (serviceConnector != null) {
-			serviceConnector.shutdownBackgroundService();
-			stopService(backgroundService);
-		}
-	}
-
-
-	/**
-	 * Stops gps, kills service, kills service connector, kills commandListener and handler
-	 */
-	public void destroyStuff() {
-		backgroundService = null;
-		serviceConnector = null;
-	}
 
 	
 	/**
@@ -335,34 +205,6 @@ public void resetTrack() {
 		//TODO somehow let the CommandListener know of the reset
 	}
 
-	private void onAdapterConnected() {
-		displayCrouton("OBD-II Adapter connected");
-	}
-
-
-	private void onAdapterDisconnected() {
-		displayToast("OBD-II Adapter disconnected");	
-	}
-
-	private void connectionPermanentlyFailed() {
-		displayToast("OBD-II Adapter connection permanently failed");
-	}
-
-	private void displayToast(final String string) {
-		Toast.makeText(getApplicationContext(), string, Toast.LENGTH_LONG).show();
-	}
-	
-	private void displayCrouton(final String string) {
-		if (getCurrentActivity() == null) return;
-		
-		getCurrentActivity().runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				Crouton.makeText(getCurrentActivity(), string, Style.INFO).show();
-			}
-		});		
-	}
-
 
 	public void finishTrack() {
 		final Track track = DbAdapterImpl.instance().finishCurrentTrack();
@@ -386,13 +228,4 @@ public void run() {
 	}
 
 
-	public void startDeviceDiscoveryService() {
-		if (deviceInRangeService != null) {
-			stopService(deviceInRangeService);
-		}
-		deviceInRangeService = new Intent(ECApplication.this, DeviceInRangeService.class);
-		startService(deviceInRangeService);		
-	}
-
-
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/application/LocationUpdateListener.java b/org.envirocar.app/src/org/envirocar/app/application/LocationUpdateListener.java
index fda047f1a..339f43c1f 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/LocationUpdateListener.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/LocationUpdateListener.java
@@ -22,6 +22,7 @@
 
 import org.envirocar.app.event.EventBus;
 import org.envirocar.app.event.GpsDOPEvent;
+import org.envirocar.app.event.GpsSatelliteFixEvent;
 import org.envirocar.app.event.LocationEvent;
 import org.envirocar.app.logging.Logger;
 
@@ -36,9 +37,10 @@ public class LocationUpdateListener implements LocationListener, NmeaListener {
 	private static final Logger logger = Logger.getLogger(LocationUpdateListener.class);
 	private static final String GPGSA = "$GPGSA";
 	private static final String NMEA_SEP = ",";
-	private static LocationUpdateListener instance;
+	private LocationManager lm;
 	
-	public LocationUpdateListener() {
+	public LocationUpdateListener(LocationManager lm) {
+		this.lm = lm;
 	}
 	/**
 	 * updates the location variables when the device moved
@@ -51,7 +53,7 @@ public void onLocationChanged(Location location) {
 
 	@Override
 	public void onProviderDisabled(String arg0) {
-
+		
 	}
 
 	@Override
@@ -64,21 +66,18 @@ public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
 
 	}
 
-	public static synchronized LocationUpdateListener getInstance() {
-		if (instance == null)
-			instance = new LocationUpdateListener();
-		return instance;
-	}
 	
-	public static void startLocating(LocationManager lm) {
+	public void startLocating() {
 		lm.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0,
-				0, getInstance());
-		lm.addNmeaListener(getInstance());
+				0, this);
+		lm.addNmeaListener(this);
 	}
 	
-	public static void stopLocating(LocationManager lm) {
-		lm.removeUpdates(getInstance());
-		lm.removeNmeaListener(getInstance());
+	public void stopLocating() {
+		lm.removeUpdates(this);
+		lm.removeNmeaListener(this);
+		
+		EventBus.getInstance().fireEvent(new GpsSatelliteFixEvent(0, false));
 	}
 	
 	@Override
@@ -87,11 +86,12 @@ public void onNmeaReceived(long timestamp, String nmea) {
 		 * eg2.: $GPGSA,A,3,19,28,14,18,27,22,31,39,,,,,1.7,1.0,1.3*35
 		 */
 		if (nmea.startsWith(GPGSA)) {
+			boolean fix = true;
 			if (nmea.charAt(7) == ',' || nmea.charAt(9) == '1') {
 				/*
 				 * no GPS fix, skip
 				 */
-				return;
+				fix = false;
 			}
 			
 			int checksumIndex = nmea.lastIndexOf("*");
@@ -105,6 +105,13 @@ public void onNmeaReceived(long timestamp, String nmea) {
 				 */
 				return;
 			}
+
+			int numberOfSats = resolveSatelliteCount(values);
+			
+			/*
+			 * fire an event on the GPS status (fix and number of sats)
+			 */
+			EventBus.getInstance().fireEvent(new GpsSatelliteFixEvent(numberOfSats, fix));
 			
 			Double pdop = null, hdop = null, vdop = null;
 			if (values.length > 15) {
@@ -123,6 +130,23 @@ public void onNmeaReceived(long timestamp, String nmea) {
 		}
 	}
 	
+	private int resolveSatelliteCount(String[] values) {
+		if (values == null || values.length < 3) {
+			return 0;
+		}
+		
+		int result = 0;
+		for (int i = 3; i < 15; i++) {
+			if (i > values.length-1) {
+				break;
+			}
+			
+			if (!values[i].trim().isEmpty()) {
+				result++;
+			}
+		}
+		return result;
+	}
 	private Double parseDopString(String string) {
 		if (string == null || string.isEmpty()) return null;
 		
diff --git a/org.envirocar.app/src/org/envirocar/app/application/TermsOfUseManager.java b/org.envirocar.app/src/org/envirocar/app/application/TermsOfUseManager.java
index 9627d8667..953d2db9b 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/TermsOfUseManager.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/TermsOfUseManager.java
@@ -26,17 +26,17 @@
 import org.envirocar.app.activity.DialogUtil;
 import org.envirocar.app.activity.DialogUtil.PositiveNegativeCallback;
 import org.envirocar.app.dao.DAOProvider;
-import org.envirocar.app.dao.TermsOfUseRetrievalException;
+import org.envirocar.app.dao.DAOProvider.AsyncExecutionWithCallback;
+import org.envirocar.app.dao.exception.DAOException;
+import org.envirocar.app.dao.exception.TermsOfUseRetrievalException;
 import org.envirocar.app.exception.ServerException;
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.model.TermsOfUse;
 import org.envirocar.app.model.TermsOfUseInstance;
-import org.envirocar.app.network.RestClient;
+import org.envirocar.app.model.User;
 
 import android.app.Activity;
 
-import com.loopj.android.http.AsyncHttpResponseHandler;
-
 import de.keyboardsurfer.android.widget.crouton.Crouton;
 import de.keyboardsurfer.android.widget.crouton.Style;
 
@@ -135,18 +135,26 @@ private void setList(TermsOfUse termsOfUse) {
 	}
 
 	public void userAcceptedTermsOfUse(final User user, final String issuedDate) {
-		RestClient.updateAcceptedTermsOfUseVersion(user, issuedDate, new AsyncHttpResponseHandler() {
+		DAOProvider.async(new AsyncExecutionWithCallback<Void>() {
+
 			@Override
-			public void onSuccess(int statusCode, String content) {
-				user.setAcceptedTermsOfUseVersion(issuedDate);
-				//TODO verify the user resource on the server
-				UserManager.instance().setUser(user);
-				logger.info("User successfully updated.");
+			public Void execute() throws DAOException {
+				user.setTouVersion(issuedDate);
+				DAOProvider.instance().getUserDAO().updateUser(user);
+				return null;
 			}
-			
+
 			@Override
-			public void onFailure(Throwable error, String content) {
-				logger.warn(content, error);
+			public Void onResult(Void result, boolean fail, Exception exception) {
+				if (!fail) {
+					user.setTouVersion(issuedDate);
+					UserManager.instance().setUser(user);
+					logger.info("User successfully updated.");
+				}
+				else {
+					logger.warn(exception.getMessage(), exception);
+				}
+				return null;
 			}
 		});
 	}
@@ -181,7 +189,7 @@ public static void askForTermsOfUseAcceptance(final User user, final Activity ac
 			final PositiveNegativeCallback callback) {
 		boolean verified = false;
 		try {
-			verified = TermsOfUseManager.verifyTermsUseOfVersion(user.getAcceptedTermsOfUseVersion());
+			verified = TermsOfUseManager.verifyTermsUseOfVersion(user.getTouVersion());
 		} catch (ServerException e) {
 			logger.warn(e.getMessage(), e);
 			return;
@@ -197,7 +205,7 @@ public static void askForTermsOfUseAcceptance(final User user, final Activity ac
 			}
 			
 			DialogUtil.createTermsOfUseDialog(current,
-					user.getAcceptedTermsOfUseVersion() == null, new DialogUtil.PositiveNegativeCallback() {
+					user.getTouVersion() == null, new DialogUtil.PositiveNegativeCallback() {
 
 				@Override
 				public void negative() {
diff --git a/org.envirocar.app/src/org/envirocar/app/application/UploadManager.java b/org.envirocar.app/src/org/envirocar/app/application/UploadManager.java
index 52553a95b..532ba7ad0 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/UploadManager.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/UploadManager.java
@@ -21,38 +21,27 @@
 
 package org.envirocar.app.application;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.http.Header;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.FileEntity;
 import org.envirocar.app.R;
 import org.envirocar.app.activity.SettingsActivity;
 import org.envirocar.app.dao.DAOProvider;
-import org.envirocar.app.dao.NotConnectedException;
-import org.envirocar.app.json.TrackEncoder;
+import org.envirocar.app.dao.DAOProvider.AsyncExecutionWithCallback;
+import org.envirocar.app.dao.exception.DAOException;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.model.Car;
-import org.envirocar.app.network.HTTPClient;
 import org.envirocar.app.storage.DbAdapter;
 import org.envirocar.app.storage.DbAdapterImpl;
 import org.envirocar.app.storage.Track;
 import org.envirocar.app.storage.TrackMetadata;
 import org.envirocar.app.storage.TrackWithoutMeasurementsException;
-import org.json.JSONException;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.AsyncTask;
 import android.preference.PreferenceManager;
 import de.keyboardsurfer.android.widget.crouton.Crouton;
 import de.keyboardsurfer.android.widget.crouton.Style;
@@ -69,7 +58,6 @@ public class UploadManager {
 	public static final String NET_ERROR = "net_error";
 	public static final String GENERAL_ERROR = "-1";
 	
-	private String url = ECApplication.BASE_URL + "/users/%1$s/tracks";
 	private static Logger logger = Logger.getLogger(UploadManager.class);
 	private DbAdapter dbAdapter;
 	private Context context;
@@ -86,6 +74,11 @@ public UploadManager(Context ctx) {
 		this.dbAdapter = DbAdapterImpl.instance();
 	}
 
+	public boolean isObfuscationEnabled() {
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+		return prefs.getBoolean(SettingsActivity.OBFUSCATE_POSITION, false);
+	}
+	
 	/**
 	 * This methods uploads all local tracks to the server
 	 */
@@ -95,13 +88,84 @@ public void uploadAllTracks(TrackUploadFinishedHandler callback) {
 		}
 	}
 	
-	public void uploadSingleTrack(Track track, TrackUploadFinishedHandler callback) {
+	public void uploadSingleTrack(final Track track, final TrackUploadFinishedHandler callback) {
 		if (track == null ) return;
 		
-		new UploadAsyncTask(callback).execute(track);
+		DAOProvider.async(new AsyncExecutionWithCallback<String>() {
+
+			@Override
+			public String execute() throws DAOException {
+				Thread.currentThread().setName("TrackUploaderTask-"+track.getId());
+				
+				/*
+				 * inject track metadata
+				 */
+				track.updateMetadata(new TrackMetadata(context));
+				
+				if (hasTemporaryCar(track)) {
+					/*
+					 * perhaps we already did a registration for this temp car.
+					 * the Map is application uptime scope (static).
+					 */
+					if (!temporaryCarAlreadyRegistered(track)) {
+						registerCarBeforeUpload(track);
+					}
+					
+				}
+				
+				try {
+					String result = DAOProvider.instance().getTrackDAO().storeTrack(track, isObfuscationEnabled());
+					return result;
+				} catch (TrackWithoutMeasurementsException e) {
+					if (track.getNumberOfMeasurements() != 0) {
+						alertOnObfuscationMeasurements();
+					}
+					throw new DAOException(e);
+				}
+			}
+
+			private void alertOnObfuscationMeasurements() {
+				/*
+				 * obfuscation removed all measurements
+				 */
+				final Activity ac = ((ECApplication) context).getCurrentActivity();
+				if (ac != null) {
+					ac.runOnUiThread(new Runnable() {
+						@Override
+						public void run() {
+							Crouton.makeText(ac, R.string.uploading_track_no_measurements_after_obfuscation_long, Style.ALERT).show();								
+						}
+					});
+				}
+				((ECApplication) context).createNotification(context.getResources().getString(R.string.uploading_track_no_measurements_after_obfuscation));
+			}
+
+			@Override
+			public String onResult(String result, boolean fail,
+					Exception e) {
+				if (!fail) {
+					/*
+					 * success, we got an ID
+					 */
+					((ECApplication) context).createNotification("success");
+					track.setRemoteID(result);
+					dbAdapter.updateTrack(track);
+					
+					if (callback != null) {
+						callback.onSuccessfulUpload(track);
+					}
+				}
+				else {
+					logger.warn(e.getMessage(), e);
+					((ECApplication) context).createNotification(context.getResources().getString(R.string.general_error_please_report));
+				}
+				return null;
+			}
+		});
+		
 	}
 	
-	private void registerCarBeforeUpload(Track track) throws NotConnectedException {
+	private void registerCarBeforeUpload(Track track) throws NotConnectedException, UnauthorizedException {
 		Car car = track.getCar();
 		String tempId = car.getId();
 		String sensorIdFromServer = DAOProvider.instance().getSensorDAO().saveSensor(car);
@@ -127,118 +191,6 @@ private boolean hasTemporaryCar(Track track) {
 		return track.getCar().getId().startsWith(Car.TEMPORARY_SENSOR_ID);
 	}
 	
-	
-	private class UploadAsyncTask extends AsyncTask<Track, Track, Track> {
-		
-		
-		private TrackUploadFinishedHandler callback;
-
-		public UploadAsyncTask(TrackUploadFinishedHandler callback) {
-			this.callback = callback;
-		}
-
-		@Override
-		protected Track doInBackground(Track... params) {
-			((ECApplication) context).createNotification("start");
-			User user = UserManager.instance().getUser();
-			String username = user.getUsername();
-			String token = user.getToken();
-			String urlL = String.format(url, username);
-			
-			Track track = params[0];
-			Thread.currentThread().setName("TrackUploaderTast-"+track.getId());
-			
-			if (hasTemporaryCar(track)) {
-				/*
-				 * perhaps we already did a registration for this temp car.
-				 * the Map is application uptime scope (static).
-				 */
-				if (!temporaryCarAlreadyRegistered(track)) {
-					try {
-						registerCarBeforeUpload(track);
-					} catch (NotConnectedException e) {
-						logger.warn(e.getMessage(), e);
-						this.cancel(true);
-						((ECApplication) context).createNotification(context.getResources().getString(R.string.general_error_please_report));
-					}	
-				}
-				
-			}
-
-			File file = null;
-			try {
-				file = saveTrackAndReturnFile(track);
-			} catch (JSONException e) {
-				logger.warn(e.getMessage(), e);
-				//the track wasn't JSON serializable. shouldn't occur.
-				this.cancel(true);
-				((ECApplication) context).createNotification(context.getResources().getString(R.string.general_error_please_report));
-			} catch (RuntimeException e) {
-				logger.warn(e.getMessage(), e);
-				this.cancel(true);
-				((ECApplication) context).createNotification(context.getResources().getString(R.string.general_error_please_report));
-			} catch (TrackWithoutMeasurementsException e) {
-				if (track.getNumberOfMeasurements() != 0) {
-					/*
-					 * obfuscation removed all measurements
-					 */
-					final Activity ac = ((ECApplication) context).getCurrentActivity();
-					if (ac != null) {
-						ac.runOnUiThread(new Runnable() {
-							@Override
-							public void run() {
-								Crouton.makeText(ac, R.string.uploading_track_no_measurements_after_obfuscation_long, Style.ALERT).show();								
-							}
-						});
-					}
-					((ECApplication) context).createNotification(context.getResources().getString(R.string.uploading_track_no_measurements_after_obfuscation));
-				}
-				else {
-					logger.warn(e.getMessage(), e);
-				}
-				this.cancel(true);
-			}
-			
-			if (file == null) {
-				this.cancel(true);
-				((ECApplication) context).createNotification(context.getResources().getString(R.string.general_error_please_report));
-			}
-			
-			//upload
-			String httpResult = sendHttpPost(urlL, file, token, username);
-			if (httpResult.equals(NET_ERROR)){
-				((ECApplication) context).createNotification(context.getResources().getString(R.string.error_host_not_found));
-			} else if (httpResult.equals(GENERAL_ERROR)) {
-				((ECApplication) context).createNotification(context.getResources().getString(R.string.general_error_please_report));
-			} else {
-				/*
-				 * success, we got an ID
-				 */
-				((ECApplication) context).createNotification("success");
-				track.setRemoteID(httpResult);
-				dbAdapter.updateTrack(track);
-				
-				if (callback != null) {
-					callback.onSuccessfulUpload(track);
-				}
-			}
-			
-			return track;
-		}
-		
-	}
-
-	public String getTrackJSON(Track track) throws JSONException, TrackWithoutMeasurementsException {
-		/*
-		 * inject track metadata
-		 */
-		track.updateMetadata(new TrackMetadata(context));
-		
-		return new TrackEncoder().createTrackJson(track, isObfuscationEnabled()).toString();
-	}
-	
-
-
 
 	public boolean temporaryCarAlreadyRegistered(Track track) {
 		if (temporaryAlreadyRegisteredCars.containsKey(track.getCar().getId())) {
@@ -248,100 +200,4 @@ public boolean temporaryCarAlreadyRegistered(Track track) {
 		return false;
 	}
 
-	public boolean isObfuscationEnabled() {
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-		return prefs.getBoolean(SettingsActivity.OBFUSCATE_POSITION, false);
-	}
-
-	/**
-	 * Uploads the json object to the server
-	 * 
-	 * @param url
-	 *            Url
-	 * @param contents
-	 *            The Json Object
-	 * @param xToken
-	 *            Token
-	 * @param xUser
-	 *            Username
-	 * @return Server response status code
-	 */
-	private String sendHttpPost(String url, File contents, String xToken,
-			String xUser) {
-
-		try {
-			HttpPost httpPostRequest = new HttpPost(url);
-
-			FileEntity se = new FileEntity(contents, "application/json");
-			se.setContentType("application/json");
-
-			// Set HTTP parameters
-			httpPostRequest.setEntity(se);
-			httpPostRequest.setHeader("Content-type", "application/json");
-			httpPostRequest.setHeader("X-Token", xToken);
-			httpPostRequest.setHeader("X-User", xUser);
-
-			HttpResponse response = (HttpResponse) HTTPClient
-					.execute(httpPostRequest);
-			
-			String location = "";
-			Header[] h = response.getAllHeaders();
-			for (int i = 0; i< h.length; i++){
-				if( h[i].getName().equals("Location")){
-					location += h[i].getValue();
-					break;
-				}
-			}
-			
-			String trackid = location.substring(location.lastIndexOf("/")+1, location.length());
-
-
-			int statusCode = response.getStatusLine()
-					.getStatusCode();
-			
-			logger.debug("Status Code: "+ statusCode);
-
-			if (statusCode < HttpStatus.SC_MULTIPLE_CHOICES){
-				HTTPClient.consumeEntity(response.getEntity());
-				return trackid;
-			} else {
-				String errorResponse = HTTPClient.readResponse(response.getEntity());
-				logger.warn("Server response: "+ errorResponse);
-				return GENERAL_ERROR;
-			}
-
-		} catch (UnsupportedEncodingException e) {
-			logger.warn(e.getMessage(), e);
-			return GENERAL_ERROR;
-		} catch (IOException e) {
-			logger.warn(e.getMessage(), e);
-			return NET_ERROR;
-		}
-	}
-
-	/**
-	 * Saves a json object to the sd card
-	 * 
-	 * @param obj
-	 *            the object to save
-	 * @param id 
-	 */
-	private File saveToSdCard(String obj, String id) {
-		File log = new File(context.getExternalFilesDir(null),"enviroCar-track-"+id+".json");
-		try {
-			BufferedWriter out = new BufferedWriter(new FileWriter(log.getAbsolutePath(), false));
-			out.write(obj);
-			out.flush();
-			out.close();
-			return log;
-		} catch (IOException e) {
-			logger.warn(e.getMessage(), e);
-		}
-		return null;
-	}
-	
-	public File saveTrackAndReturnFile(Track t) throws JSONException, TrackWithoutMeasurementsException{
-		return saveToSdCard(getTrackJSON(t), (t.isRemoteTrack() ? t.getRemoteID() : Long.toString(t.getId())));
-	}
-
 }
\ No newline at end of file
diff --git a/org.envirocar.app/src/org/envirocar/app/application/UserManager.java b/org.envirocar.app/src/org/envirocar/app/application/UserManager.java
index ad03881db..95ea7b4a7 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/UserManager.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/UserManager.java
@@ -1,6 +1,9 @@
 package org.envirocar.app.application;
 
 import static android.content.Context.MODE_PRIVATE;
+
+import org.envirocar.app.model.User;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -44,7 +47,7 @@ public void setUser(User user) {
 		Editor e = getUserPreferences().edit();
 		e.putString(USERNAME, user.getUsername());
 		e.putString(TOKEN, user.getToken());
-		e.putString(ACCEPTED_TERMS_OF_USE_VERSION, user.getAcceptedTermsOfUseVersion());
+		e.putString(ACCEPTED_TERMS_OF_USE_VERSION, user.getTouVersion());
 		e.commit();
 	}
 
@@ -57,7 +60,7 @@ public User getUser() {
 		String username = prefs.getString(USERNAME, null);
 		String token = prefs.getString(TOKEN, null);
 		User result = new User(username, token);
-		result.setAcceptedTermsOfUseVersion(prefs.getString(ACCEPTED_TERMS_OF_USE_VERSION, null));
+		result.setTouVersion(prefs.getString(ACCEPTED_TERMS_OF_USE_VERSION, null));
 		return result;
 	}
 
diff --git a/org.envirocar.app/src/org/envirocar/app/application/service/AbstractBackgroundServiceStateReceiver.java b/org.envirocar.app/src/org/envirocar/app/application/service/AbstractBackgroundServiceStateReceiver.java
index 5b1b7a81a..bc4dd6acd 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/service/AbstractBackgroundServiceStateReceiver.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/service/AbstractBackgroundServiceStateReceiver.java
@@ -29,7 +29,7 @@ public abstract class AbstractBackgroundServiceStateReceiver extends BroadcastRe
 	public static final String SERVICE_STATE = BackgroundServiceImpl.class.getName()+".STATE";
 	
 	public static enum ServiceState {
-		SERVICE_STOPPED, SERVICE_DEVICE_DISCOVERY_PENDING, SERVICE_STARTING, SERVICE_STARTED, SERVICE_STOPPING;
+		SERVICE_STOPPED, SERVICE_DEVICE_DISCOVERY_PENDING, SERVICE_DEVICE_DISCOVERY_RUNNING, SERVICE_STARTING, SERVICE_STARTED, SERVICE_STOPPING;
 	}
 	
 	@Override
diff --git a/org.envirocar.app/src/org/envirocar/app/application/service/BackgroundServiceImpl.java b/org.envirocar.app/src/org/envirocar/app/application/service/BackgroundServiceImpl.java
index 718a1ff5a..5e7c69039 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/service/BackgroundServiceImpl.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/service/BackgroundServiceImpl.java
@@ -24,8 +24,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Locale;
 
 import org.envirocar.app.R;
+import org.envirocar.app.activity.MainActivity;
 import org.envirocar.app.activity.SettingsActivity;
 import org.envirocar.app.activity.TroubleshootingFragment;
 import org.envirocar.app.application.CarManager;
@@ -35,22 +37,31 @@
 import org.envirocar.app.application.service.AbstractBackgroundServiceStateReceiver.ServiceState;
 import org.envirocar.app.bluetooth.BluetoothConnection;
 import org.envirocar.app.bluetooth.BluetoothSocketWrapper;
+import org.envirocar.app.event.EventBus;
+import org.envirocar.app.event.GpsSatelliteFix;
+import org.envirocar.app.event.GpsSatelliteFixEvent;
+import org.envirocar.app.event.GpsSatelliteFixEventListener;
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.protocol.ConnectionListener;
 import org.envirocar.app.protocol.OBDCommandLooper;
 
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.location.LocationManager;
 import android.os.Binder;
+import android.os.Handler;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
+import android.speech.tts.TextToSpeech;
+import android.speech.tts.TextToSpeech.OnInitListener;
+import android.support.v4.app.NotificationCompat;
 import android.widget.Toast;
 import static org.envirocar.app.application.service.AbstractBackgroundServiceStateReceiver.*;
 
@@ -70,13 +81,11 @@ public class BackgroundServiceImpl extends Service implements BackgroundService
 			BackgroundServiceImpl.class.getName()+".CONNECTION_PERMANENTLY_FAILED";
 	
 	protected static final long CONNECTION_CHECK_INTERVAL = 1000 * 5;
-	// Properties
-
-	private static final String SERVICE_STATE_REQUEST = BackgroundServiceImpl.class.getName()+
-			".SERVICE_STATE_REQUEST";
 
 	protected static final int MAX_RECONNECT_COUNT = 2;
 
+	public static final int BG_NOTIFICATION_ID = 42;
+
 	private Listener commandListener;
 	private final Binder binder = new LocalBinder();
 
@@ -84,10 +93,22 @@ public class BackgroundServiceImpl extends Service implements BackgroundService
 
 	private BluetoothConnection bluetoothConnection;
 
-	protected ServiceState state;
+	protected ServiceState state = ServiceState.SERVICE_STOPPED;
 
 	protected int reconnectCount;
 
+	private Handler toastHandler;
+
+	private TextToSpeech tts;
+
+	public boolean ttsAvailable;
+
+	private LocationUpdateListener locationListener;
+
+	private GpsSatelliteFixEventListener gpsListener;
+
+	protected GpsSatelliteFix fix = new GpsSatelliteFix(0, false);
+
 
 	@Override
 	public IBinder onBind(Intent intent) {
@@ -99,16 +120,13 @@ public IBinder onBind(Intent intent) {
 	public void onCreate() {
 		logger.info("onCreate " + getClass().getName() +"; Hash: "+System.identityHashCode(this));
 		
-		BroadcastReceiver stateRequestReceiver = new BroadcastReceiver() {
-			@Override
-			public void onReceive(Context context, Intent intent) {
-				sendStateBroadcast();
-			}
-		};
 		
-		registerReceiver(stateRequestReceiver, new IntentFilter(SERVICE_STATE_REQUEST));
+		tts = new TextToSpeech(getApplicationContext(), new TextToSpeechListener());
+		
+		toastHandler = new Handler();
 	}
 	
+	
 	@Override
 	public void onRebind(Intent intent) {
 		super.onRebind(intent);
@@ -125,28 +143,74 @@ public boolean onUnbind(Intent intent) {
 	public void onDestroy() {
 		logger.info("onDestroy " + getClass().getName() +"; Hash: "+System.identityHashCode(this));
 		stopBackgroundService();
+		stopForeground(true);
 	}
 
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
 		logger.info("onStartCommand " + getClass().getName() +"; Hash: "+System.identityHashCode(this));
 		startBackgroundService();
+		
+		createForegroundNotification(R.string.service_state_starting);
+
+		doTextToSpeech("Establishing connection");
+		
 		return START_STICKY;
 	}
 
+	private void doTextToSpeech(String string) {
+		if (ttsAvailable) {
+			tts.speak("enviro car ".concat(string), TextToSpeech.QUEUE_ADD, null);		
+		}
+	}
+
+	private void createForegroundNotification(int stringResource) {
+		CharSequence string = getResources().getText(stringResource);
+		
+		Intent intent = new Intent(this, MainActivity.class);
+        PendingIntent pIntent = PendingIntent.getActivity(this, 0, intent, Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        
+		Notification note = new NotificationCompat.Builder(getApplicationContext()).
+				setContentTitle("enviroCar").
+				setContentText(string).
+				setContentIntent(pIntent).
+				setSmallIcon(R.drawable.dashboard).build();
+
+		note.flags |= Notification.FLAG_NO_CLEAR;
+		
+		startForeground(BG_NOTIFICATION_ID, note);
+	}
+
 	/**
 	 * Starts the background service (bluetooth connction). Then calls methods
 	 * to start sending the obd commands for initialization.
 	 */
 	private void startBackgroundService() {
 		logger.info("startBackgroundService called");
-		LocationUpdateListener.startLocating((LocationManager) getSystemService(Context.LOCATION_SERVICE));
+		this.locationListener = new LocationUpdateListener((LocationManager) getSystemService(Context.LOCATION_SERVICE));
+		this.locationListener.startLocating();
 		
-		try {
-			startConnection();
-		} catch (IOException e) {
-			logger.warn(e.getMessage(), e);
-		}
+		gpsListener = new GpsSatelliteFixEventListener() {
+			@Override
+			public void receiveEvent(GpsSatelliteFixEvent event) {
+				GpsSatelliteFix newFix = event.getPayload();
+				
+				if (fix.isFix() != newFix.isFix()) {
+					if (newFix.isFix()) {
+						doTextToSpeech("GPS positioning established");
+					}
+					else {
+						doTextToSpeech("GPS positioning lost. Try to move the phone");
+					}
+				}
+				
+				fix = newFix;
+			}
+		};
+		
+		EventBus.getInstance().registerListener(gpsListener);
+		
+		startConnection();
 	}
 
 	/**
@@ -160,14 +224,25 @@ private void stopBackgroundService() {
 			public void run() {
 				shutdownConnectionAndHandler();
 				
-				state = ServiceState.SERVICE_STOPPED;
+				setState(ServiceState.SERVICE_STOPPED);
 				sendStateBroadcast();
+
+				EventBus.getInstance().unregisterListener(gpsListener);
 				
-				LocationUpdateListener.stopLocating((LocationManager) getSystemService(Context.LOCATION_SERVICE));
+				locationListener.stopLocating();
 				
 				if (BackgroundServiceImpl.this.commandListener != null) {
 					BackgroundServiceImpl.this.commandListener.shutdown();
 				}
+				
+				Notification noti = new NotificationCompat.Builder(getApplicationContext()).setContentTitle("enviroCar").
+						setContentText(getResources().getText(R.string.service_state_stopped)).
+						setSmallIcon(R.drawable.dashboard).setAutoCancel(true).build();
+				
+				NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+				manager.notify(BG_NOTIFICATION_ID, noti);
+				
+				doTextToSpeech("Device disconnected");
 			}
 
 
@@ -175,13 +250,13 @@ public void run() {
 	}
 	
 	private void shutdownConnectionAndHandler() {
-		if (BackgroundServiceImpl.this.bluetoothConnection != null) {
-			BackgroundServiceImpl.this.bluetoothConnection.cancelConnection();
-		}
-		
 		if (BackgroundServiceImpl.this.commandLooper != null) {
 			BackgroundServiceImpl.this.commandLooper.stopLooper();
 		}
+		
+		if (BackgroundServiceImpl.this.bluetoothConnection != null) {
+			BackgroundServiceImpl.this.bluetoothConnection.cancelConnection();
+		}
 	}
 	
 	private void sendStateBroadcast() {
@@ -195,14 +270,14 @@ private void sendStateBroadcast() {
 	 * 
 	 * @throws IOException
 	 */
-	private void startConnection() throws IOException {
+	private void startConnection() {
 		logger.info("startConnection called");
 		// Connect to bluetooth device
 		// Init bluetooth
 		
 		startBluetoothConnection();
 		
-		state = ServiceState.SERVICE_STARTING;
+		setState(ServiceState.SERVICE_STARTING);
 		sendStateBroadcast();
 	}
 
@@ -248,6 +323,10 @@ public void deviceConnected(BluetoothSocketWrapper bluetoothSocket) {
 		}
 
 		initializeCommandLooper(in, out, bluetoothSocket.getRemoteDeviceName());
+		
+		createForegroundNotification(R.string.service_state_started);
+		
+		doTextToSpeech("Connection established");
 	}
 
 	protected void initializeCommandLooper(InputStream in, OutputStream out, String deviceName) {
@@ -257,15 +336,16 @@ protected void initializeCommandLooper(InputStream in, OutputStream out, String
 				this.commandListener, new ConnectionListener() {
 					@Override
 					public void onConnectionVerified() {
-						state = ServiceState.SERVICE_STARTED;
+						setState(ServiceState.SERVICE_STARTED);
 						BackgroundServiceImpl.this.sendStateBroadcast();
+						reconnectCount = 0;
 					}
 					
-					@Override
-					public void onConnectionException(IOException e) {
-						logger.warn("onConnectionException", e);
-						BackgroundServiceImpl.this.deviceDisconnected();
-					}
+//					@Override
+//					public void onConnectionException(IOException e) {
+//						logger.warn("onConnectionException", e);
+//						BackgroundServiceImpl.this.deviceDisconnected();
+//					}
 
 					@Override
 					public void onAllAdaptersFailed() {
@@ -274,30 +354,44 @@ public void onAllAdaptersFailed() {
 
 					@Override
 					public void onStatusUpdate(String message) {
-						Toast.makeText(getApplicationContext(), message, Toast.LENGTH_LONG).show();
+						displayToast(message);
 					}
 
 					@Override
 					public void requestConnectionRetry(IOException reason) {
-						Toast.makeText(getApplicationContext(), R.string.connection_lost_info, Toast.LENGTH_LONG).show();
-						
 						if (reconnectCount++ >= MAX_RECONNECT_COUNT) {
-							onConnectionException(reason);
+							logger.warn("max reconnect count reached", reason);
+							BackgroundServiceImpl.this.deviceDisconnected();
 						}
 						else {
 							logger.info("Restarting Device Connection...");
+							doTextToSpeech("Connection lost. Trying to reconnect.");
 							shutdownConnectionAndHandler();
-							startBluetoothConnection();	
+							startConnection();
 						}
-						
 					}
 				});
 		this.commandLooper.start();
 	}
 
+	protected void setState(ServiceState serviceStarted) {
+		this.state = serviceStarted;
+		logger.info(this.state.toString());
+	}
+
+	private void displayToast(final String s) {
+		toastHandler.post(new Runnable() {
+			@Override
+			public void run() {
+				Toast.makeText(getApplicationContext(), s, Toast.LENGTH_LONG).show();
+			}
+		});
+	}
+	
 	public void onAllAdaptersFailed() {
 		logger.info("all adapters failed!");
 		stopBackgroundService();
+		doTextToSpeech("failed to connect to the OBD adapter");
 		sendBroadcast(new Intent(CONNECTION_PERMANENTLY_FAILED_INTENT));		
 	}
 	
@@ -314,27 +408,27 @@ public void openTroubleshootingFragment(int type) {
 	 * 
 	 */
 	private class LocalBinder extends Binder implements BackgroundServiceInteractor {
-	
-		@Override
-		public void initializeConnection() {
-//			startBackgroundService();
-		}
 		
 		@Override
-		public void shutdownConnection() {
-			logger.info("stopping service!");
-			stopBackgroundService();
+		public ServiceState getServiceState() {
+			return BackgroundServiceImpl.this.state;
 		}
 
+	}
+	
+	private class TextToSpeechListener implements OnInitListener {
+
 		@Override
-		public void allAdaptersFailed() {
-			logger.info("all adapters failed!");
-			onAllAdaptersFailed();
+		public void onInit(int status) {
+			if (status == TextToSpeech.SUCCESS) {
+				ttsAvailable = true;
+				tts.setLanguage(Locale.ENGLISH);
+			}
+			else {
+				logger.warn("TextToSpeech is not available.");
+			}
 		}
+		
 	}
 
-	public static void requestServiceStateBroadcast(Context ctx) {
-		ctx.sendBroadcast(new Intent(SERVICE_STATE_REQUEST));
-	}
-	
 }
\ No newline at end of file
diff --git a/org.envirocar.app/src/org/envirocar/app/application/service/BackgroundServiceInteractor.java b/org.envirocar.app/src/org/envirocar/app/application/service/BackgroundServiceInteractor.java
index 8263d492f..b2783e0db 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/service/BackgroundServiceInteractor.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/service/BackgroundServiceInteractor.java
@@ -21,34 +21,20 @@
 
 package org.envirocar.app.application.service;
 
-import android.content.Intent;
+import org.envirocar.app.application.service.AbstractBackgroundServiceStateReceiver.ServiceState;
 
 /**
- * Interface that adds jobs to the waiting list and executes it
- * 
- * @author jakob
+ * Interface that provides access to the background services
+ * state
  * 
  */
 public interface BackgroundServiceInteractor {
 	
 
 	/**
-	 * this method shall create all required resources (e.g. bluetooth connection)
-	 */
-	void initializeConnection();
-
-	
-	/**
-	 * this method shall free all resources created in {@link #initializeConnection()}
-	 */
-	void shutdownConnection();
-	
-	/**
-	 * an implementation shall invoke the shutdown of the underlying service as
-	 * we could not receive any data. An {@link Intent} with action {@link #CONNECTION_PERMANENTLY_FAILED_INTENT}
-	 * shall be broadcasted.
+	 * @return the current state of the service
 	 */
-	void allAdaptersFailed();
+	ServiceState getServiceState();
 
 
 }
\ No newline at end of file
diff --git a/org.envirocar.app/src/org/envirocar/app/application/service/DeviceInRangeService.java b/org.envirocar.app/src/org/envirocar/app/application/service/DeviceInRangeService.java
index d477da9a0..5b669b0da 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/service/DeviceInRangeService.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/service/DeviceInRangeService.java
@@ -20,24 +20,31 @@
  */
 package org.envirocar.app.application.service;
 
-import java.util.ArrayList;
 
+import org.envirocar.app.R;
+import org.envirocar.app.activity.MainActivity;
 import org.envirocar.app.activity.SettingsActivity;
 import org.envirocar.app.application.service.AbstractBackgroundServiceStateReceiver.ServiceState;
 import org.envirocar.app.logging.Logger;
 
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.ServiceConnection;
 import android.content.SharedPreferences;
+import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
-import android.os.Parcelable;
 import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
 
 /**
  * backgroundService for managing the auto-discovery of the
@@ -50,14 +57,7 @@ public class DeviceInRangeService extends Service {
 	
 	private static final Logger logger = Logger.getLogger(DeviceInRangeService.class);
 
-	public static final String DEVICE_FOUND = DeviceInRangeService.class.getName().concat(".DEVICE_FOUND");
-	public static final String DELAY_EXTRA = DeviceInRangeService.class.getName().concat(".INITIAL_DELAY");
-	public static final String STATE_CHANGE = DeviceInRangeService.class.getName().concat(".STATE_CHANGE");
-	public static final String TARGET_CONNECTION_TIME = DeviceInRangeService.class.getName().concat(".TARGET_CONNECTION_TIME");
-	
 	private static final long DISCOVERY_PERIOD = 1000 * 60 * 2;
-	
-	protected ServiceState backgroundServiceState = ServiceState.SERVICE_STOPPED;
 
 	protected boolean autoConnect;
 	
@@ -70,13 +70,6 @@ public void onReceive(Context context, Intent intent) {
 			if (BluetoothDevice.ACTION_FOUND.equals(action)) {
 				verifyRemoteDevice(intent);
 			}
-			
-			else if (action.equals(STATE_CHANGE)) {
-				if (!intent.getBooleanExtra(STATE_CHANGE, false)) {
-					discoveryEnabled = false;
-					stopSelf();	
-				}
-			}
 
 		}
 	};
@@ -84,35 +77,55 @@ else if (action.equals(STATE_CHANGE)) {
 
 	
 	private Runnable discoveryRunnable;
-	protected boolean discoveryEnabled = true;
+	protected boolean discoveryEnabled = false;
 	private Handler discoveryHandler;
 
+	protected BackgroundServiceInteractor backgroundService;
+
+	private long targetSystemTime;
+
 	@Override
 	public void onCreate() {
 		logger.info("onCreate " + getClass().getName() +"; Hash: "+System.identityHashCode(this));
 		registerReceiver(receiver, new IntentFilter(BluetoothDevice.ACTION_FOUND));
-		registerReceiver(receiver, new IntentFilter(STATE_CHANGE));
 		
 		discoveryHandler = new Handler();
+		
+		bindToBackgroundService();
 	}
 	
-	@Override
-	public void onRebind(Intent intent) {
-		super.onRebind(intent);
-		logger.info("onRebind " + getClass().getName() +"; Hash: "+System.identityHashCode(this));
-	}
-	
-	@Override
-	public boolean onUnbind(Intent intent) {
-		logger.info("onUnbind " + getClass().getName() +"; Hash: "+System.identityHashCode(this));
-		return super.onUnbind(intent);
+	private void bindToBackgroundService() {
+		if (!bindService(new Intent(this, BackgroundServiceImpl.class),
+				new ServiceConnection() {
+					
+					@Override
+					public void onServiceDisconnected(ComponentName name) {
+						logger.info(String.format("BackgroundService %S disconnected!", name.flattenToString()));
+					}
+					
+					@Override
+					public void onServiceConnected(ComponentName name, IBinder service) {
+						backgroundService = (BackgroundServiceInteractor) service;
+					}
+				}, 0)) {
+			logger.warn("Could not connect to BackgroundService.");
+		}		
 	}
 
 	@Override
 	public void onDestroy() {
 		logger.info("onDestroy " + getClass().getName() +"; Hash: "+System.identityHashCode(this));
 		unregisterReceiver(receiver);
+		
+		NotificationManager notificationManager = (NotificationManager) 
+				  getSystemService(NOTIFICATION_SERVICE);
+		
+		notificationManager.cancel(BackgroundServiceImpl.BG_NOTIFICATION_ID);
+		
+		discoveryEnabled = false;
+		discoveryHandler.removeCallbacks(discoveryRunnable);
 	}
+	
 
 	protected void verifyRemoteDevice(Intent intent) {
 		SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
@@ -128,25 +141,39 @@ protected void verifyRemoteDevice(Intent intent) {
 	}
 
 	private void initializeConnection(BluetoothDevice discoveredDevice) {
-		discoveryEnabled = false;
-		discoveryHandler.removeCallbacks(discoveryRunnable);
-		Intent intent = new Intent(DEVICE_FOUND);
-		ArrayList<Parcelable> list = new ArrayList<Parcelable>();
-		list.add(discoveredDevice);
-		intent.putParcelableArrayListExtra(DEVICE_FOUND, list);
-		sendBroadcast(intent);
 		stopSelf();
+		
+		startService(new Intent(getApplicationContext(), BackgroundServiceImpl.class));
 	}
 	
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
 		logger.info("onStartCommand " + getClass().getName() +"; Hash: "+System.identityHashCode(this));
-		startWithDelay(DISCOVERY_PERIOD);
+
+		discoveryEnabled = true;
+		
+		startWithDelay(0);
+		
+        PendingIntent pIntent = PendingIntent.getActivity(this, 0,
+        		new Intent(this, MainActivity.class), Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+		
+		Notification note = new NotificationCompat.Builder(getApplicationContext()).
+				setSmallIcon(R.drawable.dashboard).
+				setContentTitle("enviroCar").
+				setContentIntent(pIntent).
+				setContentText(getResources().getText(R.string.device_discovery_pending)).
+				build();
+		
+		startForeground(BackgroundServiceImpl.BG_NOTIFICATION_ID, note);
+		
+		
 		return super.onStartCommand(intent, flags, startId);
 	}
 
 	protected void startWithDelay(long d) {
-		if (backgroundServiceState == ServiceState.SERVICE_STARTED) return;
+		if (backgroundService != null && backgroundService.getServiceState() == ServiceState.SERVICE_STARTED) {
+			return;
+		}
 		
 		discoveryEnabled = true;
 		
@@ -157,6 +184,11 @@ public void run() {
 					return;
 				}
 				
+				logger.info("starting device discovery...");
+				Intent intent = new Intent(AbstractBackgroundServiceStateReceiver.SERVICE_STATE);
+				intent.putExtra(AbstractBackgroundServiceStateReceiver.SERVICE_STATE, ServiceState.SERVICE_DEVICE_DISCOVERY_RUNNING);
+				sendBroadcast(intent);
+				
 				BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
 				if (adapter != null) {
 					if (adapter.isDiscovering()) {
@@ -165,6 +197,28 @@ public void run() {
 					adapter.startDiscovery();
 				}
 				
+				try {
+					Thread.sleep(5000);
+				} catch (InterruptedException e) {
+					logger.warn(e.getMessage(), e);
+				}
+				
+				if (!discoveryEnabled) {
+					/*
+					 * we are done, we found the device
+					 */
+					return;
+				}
+				
+				/*
+				 * update the target time and send a broadcast
+				 */
+				intent = new Intent(AbstractBackgroundServiceStateReceiver.SERVICE_STATE);
+				intent.putExtra(AbstractBackgroundServiceStateReceiver.SERVICE_STATE, ServiceState.SERVICE_DEVICE_DISCOVERY_PENDING);
+				sendBroadcast(intent);
+
+				targetSystemTime = System.currentTimeMillis() + DISCOVERY_PERIOD;
+				
 				/*
 				 * re-schedule ourselves
 				 */
@@ -173,26 +227,42 @@ public void run() {
 
 		};
 		
+		if (d > 0) {
+			Intent intent = new Intent(AbstractBackgroundServiceStateReceiver.SERVICE_STATE);
+			intent.putExtra(AbstractBackgroundServiceStateReceiver.SERVICE_STATE, ServiceState.SERVICE_DEVICE_DISCOVERY_PENDING);
+			sendBroadcast(intent);
+		}
+
+		targetSystemTime = System.currentTimeMillis() + d;
+		
+		/*
+		 * do the actual invoking
+		 */
 		invokeDiscoveryRunnable(d);
-		Intent intent = new Intent(AbstractBackgroundServiceStateReceiver.SERVICE_STATE);
-		intent.putExtra(AbstractBackgroundServiceStateReceiver.SERVICE_STATE, ServiceState.SERVICE_DEVICE_DISCOVERY_PENDING);
-		sendBroadcast(intent);
 	}
 
 	private void invokeDiscoveryRunnable(long delay) {
 		discoveryHandler.postDelayed(discoveryRunnable, delay);
-		Intent intent = new Intent(TARGET_CONNECTION_TIME);
-		intent.putExtra(TARGET_CONNECTION_TIME, System.currentTimeMillis()+delay);
-		sendBroadcast(intent);
 	}
 	
 	@Override
 	public IBinder onBind(Intent intent) {
 		logger.info("onBind " + getClass().getName() +"; Hash: "+System.identityHashCode(this));
-		/*
-		 * we do not need a binder, as we are autonomous
-		 */
-		return null;
+		return new LocalBinder();
+	}
+	
+	private class LocalBinder extends Binder implements DeviceInRangeServiceInteractor {
+
+		@Override
+		public long getNextDiscoveryTargetTime() {
+			return targetSystemTime;
+		}
+
+		@Override
+		public boolean isDiscoveryPending() {
+			return discoveryEnabled;
+		}
+		
 	}
 
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/application/service/BackgroundServiceConnector.java b/org.envirocar.app/src/org/envirocar/app/application/service/DeviceInRangeServiceInteractor.java
similarity index 52%
rename from org.envirocar.app/src/org/envirocar/app/application/service/BackgroundServiceConnector.java
rename to org.envirocar.app/src/org/envirocar/app/application/service/DeviceInRangeServiceInteractor.java
index ddadc3a07..dd3f32432 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/service/BackgroundServiceConnector.java
+++ b/org.envirocar.app/src/org/envirocar/app/application/service/DeviceInRangeServiceInteractor.java
@@ -18,45 +18,12 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  * 
  */
-
 package org.envirocar.app.application.service;
 
-import android.content.ComponentName;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-
-
-/**
- * Connector Class for bluetooth service. Partly imported from Android OBD
- * Project
- * 
- * @author jakob
- * 
- */
-public class BackgroundServiceConnector implements ServiceConnection {
-
-	private BackgroundServiceInteractor interactor;
-
-	public BackgroundServiceConnector() {
-	}
-	
-	/**
-	 * connects listener and monitor
-	 */
-	public void onServiceConnected(ComponentName componentName, IBinder binder) {
-		interactor = (BackgroundServiceInteractor) binder;
-		interactor.initializeConnection();
-	}
+public interface DeviceInRangeServiceInteractor {
 	
+	long getNextDiscoveryTargetTime();
 
-	public void onServiceDisconnected(ComponentName name) {
-		interactor.shutdownConnection();
-	}
-
-
-	public void shutdownBackgroundService() {
-		this.interactor.shutdownConnection();
-	}
-	
+	boolean isDiscoveryPending();
 
-}
\ No newline at end of file
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/commands/O2LambdaProbe.java b/org.envirocar.app/src/org/envirocar/app/commands/O2LambdaProbe.java
index 696e886b2..dd826fad8 100644
--- a/org.envirocar.app/src/org/envirocar/app/commands/O2LambdaProbe.java
+++ b/org.envirocar.app/src/org/envirocar/app/commands/O2LambdaProbe.java
@@ -28,6 +28,7 @@ public abstract class O2LambdaProbe extends NumberResultCommand {
 	private static final Logger logger = Logger.getLogger(O2LambdaProbe.class);
 	private String cylinderPosition;
 	private double equivalenceRation = Double.NaN;
+	private String pid;
 
 	public static O2LambdaProbe fromPIDEnum(PID pid) {
 		switch (pid) {
@@ -74,6 +75,7 @@ public static O2LambdaProbe fromPIDEnum(PID pid) {
 	public O2LambdaProbe(String cylinderPosition) {
 		super("01 ".concat(cylinderPosition));
 		this.cylinderPosition = cylinderPosition;
+		this.pid = cylinderPosition;
 	}
 	
 	@Override
@@ -107,5 +109,13 @@ public double getEquivalenceRatio() {
 	public String getCommandName() {
 		return "O2 Lambda Probe "+cylinderPosition;
 	}
+
+	public String getPID() {
+		return pid;
+	}
+	
+	public String lambdaString() {
+		return getClass().getSimpleName() +" ("+pid+"): "+getEquivalenceRatio() +"; "+getNumberResult();
+	}
 	
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/commands/PIDSupported.java b/org.envirocar.app/src/org/envirocar/app/commands/PIDSupported.java
index fd49e53d5..8feaeeb53 100644
--- a/org.envirocar.app/src/org/envirocar/app/commands/PIDSupported.java
+++ b/org.envirocar.app/src/org/envirocar/app/commands/PIDSupported.java
@@ -106,6 +106,7 @@ public void parseRawData() {
 		
 		if (bytes.length != 8) {
 			setCommandState(CommonCommandState.EXECUTION_ERROR);
+			return;
 		}
 		
 		while (index < data.length) {
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/AnnouncementsDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/AnnouncementsDAO.java
index 2d86c7a87..268c9287d 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/AnnouncementsDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/AnnouncementsDAO.java
@@ -22,6 +22,7 @@
 
 import java.util.List;
 
+import org.envirocar.app.dao.exception.AnnouncementsRetrievalException;
 import org.envirocar.app.model.Announcement;
 
 public interface AnnouncementsDAO {
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/DAOProvider.java b/org.envirocar.app/src/org/envirocar/app/dao/DAOProvider.java
index f693de889..784417d9d 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/DAOProvider.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/DAOProvider.java
@@ -21,11 +21,14 @@
 package org.envirocar.app.dao;
 
 import org.envirocar.app.dao.cache.CacheAnnouncementsDAO;
+import org.envirocar.app.dao.cache.CacheFuelingDAO;
 import org.envirocar.app.dao.cache.CacheSensorDAO;
 import org.envirocar.app.dao.cache.CacheTermsOfUseDAO;
 import org.envirocar.app.dao.cache.CacheTrackDAO;
 import org.envirocar.app.dao.cache.CacheUserDAO;
+import org.envirocar.app.dao.exception.DAOException;
 import org.envirocar.app.dao.remote.RemoteAnnouncementsDAO;
+import org.envirocar.app.dao.remote.RemoteFuelingDAO;
 import org.envirocar.app.dao.remote.RemoteSensorDAO;
 import org.envirocar.app.dao.remote.RemoteTermsOfUseDAO;
 import org.envirocar.app.dao.remote.RemoteTrackDAO;
@@ -101,6 +104,16 @@ public UserDAO getUserDAO() {
 		return new CacheUserDAO();
 	}
 	
+	/**
+	 * @return the {@link FuelingDAO}
+	 */
+	public FuelingDAO getFuelingDAO() {
+		if (this.internetAccessProvider.isConnected()) {
+			return new RemoteFuelingDAO(new CacheFuelingDAO(this.cacheDirectoryProvider));
+		}
+		return new CacheFuelingDAO(this.cacheDirectoryProvider);
+	}
+	
 	/**
 	 * @return the {@link TermsOfUseDAO}
 	 */
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/FuelingDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/FuelingDAO.java
new file mode 100644
index 000000000..1c4a98e69
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/dao/FuelingDAO.java
@@ -0,0 +1,36 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.dao;
+
+import java.util.List;
+
+import org.envirocar.app.dao.exception.FuelingRetrievalException;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.exception.InvalidObjectStateException;
+import org.envirocar.app.model.Fueling;
+
+public interface FuelingDAO {
+
+	public void storeFueling(Fueling fueling) throws NotConnectedException, InvalidObjectStateException;
+	
+	public List<Fueling> getFuelings() throws FuelingRetrievalException;
+	
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/SensorDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/SensorDAO.java
index 7e7764bc4..7efa7ccb2 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/SensorDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/SensorDAO.java
@@ -20,8 +20,16 @@
  */
 package org.envirocar.app.dao;
 
+import java.text.Collator;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.ResourceConflictException;
+import org.envirocar.app.dao.exception.SensorRetrievalException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
 import org.envirocar.app.model.Car;
 
 public interface SensorDAO {
@@ -44,7 +52,31 @@ public interface SensorDAO {
 	 * @param user the user for authentication reasons
 	 * @return the ID of the saved sensor as provided by the underlying DAO
 	 * @throws NotConnectedException
+	 * @throws ResourceConflictException 
+	 * @throws UnauthorizedException 
 	 */
-	public String saveSensor(Car car) throws NotConnectedException;
+	public String saveSensor(Car car) throws NotConnectedException, UnauthorizedException;
 	
+	
+	public static class SensorDAOUtil {
+		
+		public static List<Car> sortByManufacturer(List<Car> sensors) {
+			final Collator collator = Collator.getInstance(Locale.ENGLISH);
+			
+			Collections.sort(sensors, new Comparator<Car>() {
+				@Override
+				public int compare(Car lhs, Car rhs) {
+					if (lhs.getManufacturer().equals(rhs.getManufacturer())) {
+						return collator.compare(lhs.getModel(), rhs.getModel());
+					}
+					else {
+						return collator.compare(lhs.getManufacturer(), rhs.getManufacturer());
+					}
+				}
+			});
+			
+			return sensors;
+		}
+		
+	}
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/TermsOfUseDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/TermsOfUseDAO.java
index ae29729f1..fcfe0f270 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/TermsOfUseDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/TermsOfUseDAO.java
@@ -20,6 +20,7 @@
  */
 package org.envirocar.app.dao;
 
+import org.envirocar.app.dao.exception.TermsOfUseRetrievalException;
 import org.envirocar.app.model.TermsOfUse;
 import org.envirocar.app.model.TermsOfUseInstance;
 
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/TrackDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/TrackDAO.java
index 36283b4a0..925134861 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/TrackDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/TrackDAO.java
@@ -22,16 +22,61 @@
 
 import java.util.List;
 
+import org.envirocar.app.dao.exception.DAOException;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.TrackRetrievalException;
+import org.envirocar.app.dao.exception.TrackSerializationException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
 import org.envirocar.app.storage.Track;
+import org.envirocar.app.storage.TrackWithoutMeasurementsException;
 
 public interface TrackDAO {
 
 	void deleteTrack(String remoteID) throws DAOException;
-	
-	void storeTrack(Track track) throws DAOException;
-	
-	List<Track> getAllTracks();
-	
-	Track getTrack(String id);
+
+	String storeTrack(Track track, boolean obfuscate)
+			throws NotConnectedException, TrackWithoutMeasurementsException,
+			TrackSerializationException, TrackRetrievalException;
+
+	Track getTrack(String id) throws NotConnectedException;
+
+	Integer getUserTrackCount() throws NotConnectedException,
+			TrackRetrievalException;
+
+	Integer getTotalTrackCount() throws NotConnectedException,
+			TrackRetrievalException;
+
+	/**
+	 * an implementation shall treat calls as a shortcut for
+	 * {@link #getTrackIds(int)} with limit=100
+	 * 
+	 * @return the resource IDs of the desired tracks
+	 * @throws NotConnectedException
+	 * @throws UnauthorizedException 
+	 */
+	List<String> getTrackIds() throws NotConnectedException, UnauthorizedException;
+
+	/**
+	 * an implementation shall treat calls as a shortcut for
+	 * {@link #getTrackIds(int, int)} with limit=limit and page=1
+	 * 
+	 * @param limit
+	 *            the total count of returned track ids
+	 * @return the resource IDs of the desired tracks
+	 * @throws NotConnectedException
+	 * @throws UnauthorizedException 
+	 */
+	List<String> getTrackIds(int limit) throws NotConnectedException, UnauthorizedException;
+
+	/**
+	 * @param limit
+	 *            the total count of returned track ids
+	 * @param page
+	 *            the pagination index (starting at 1)
+	 * @return the resource IDs of the desired tracks
+	 * @throws NotConnectedException
+	 * @throws UnauthorizedException 
+	 */
+	List<String> getTrackIds(int limit, int page) throws NotConnectedException, UnauthorizedException;
 
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/UserDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/UserDAO.java
index 29388fad8..0777c19dc 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/UserDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/UserDAO.java
@@ -20,6 +20,17 @@
  */
 package org.envirocar.app.dao;
 
+import org.envirocar.app.dao.exception.ResourceConflictException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
+import org.envirocar.app.dao.exception.UserRetrievalException;
+import org.envirocar.app.dao.exception.UserUpdateException;
+import org.envirocar.app.model.User;
+
 public interface UserDAO {
 
+	void updateUser(User user) throws UserUpdateException, UnauthorizedException;
+
+	User getUser(String id) throws UserRetrievalException, UnauthorizedException;
+
+	void createUser(User newUser) throws UserUpdateException, ResourceConflictException;
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/cache/AbstractCacheDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/cache/AbstractCacheDAO.java
new file mode 100644
index 000000000..67769e8d1
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/dao/cache/AbstractCacheDAO.java
@@ -0,0 +1,68 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.dao.cache;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.envirocar.app.dao.CacheDirectoryProvider;
+import org.envirocar.app.util.Util;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Convenience abstract base CacheDAO class.
+ */
+public class AbstractCacheDAO {
+
+	private CacheDirectoryProvider cacheDirectoryProvider;
+
+	public AbstractCacheDAO(CacheDirectoryProvider cacheDirectoryProvider) {
+		this.cacheDirectoryProvider = cacheDirectoryProvider;
+	}
+
+	public JSONObject readCache(String cachedFile) throws IOException, JSONException {
+		File directory = cacheDirectoryProvider.getBaseFolder();
+
+		File f = new File(directory, cachedFile);
+
+		if (f.isFile()) {
+			JSONObject tou = Util.readJsonContents(f);
+			return tou;
+		} 
+		
+		throw new IOException(String.format("Could not read file %s", cachedFile));
+	}
+	
+	public boolean cacheFileExists(String cachedFile) {
+		File directory = cacheDirectoryProvider.getBaseFolder();
+
+		File f = new File(directory, cachedFile);
+
+		return f != null && f.isFile();
+	}
+	
+	protected void storeCache(String cacheFileName, String content) throws IOException {
+		File file = new File(this.cacheDirectoryProvider.getBaseFolder(), cacheFileName);
+		Util.saveContentsToFile(content, file);		
+	}
+	
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheAnnouncementsDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheAnnouncementsDAO.java
index 8414a554e..8b204bc9b 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheAnnouncementsDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheAnnouncementsDAO.java
@@ -20,33 +20,27 @@
  */
 package org.envirocar.app.dao.cache;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
 import org.envirocar.app.dao.AnnouncementsDAO;
-import org.envirocar.app.dao.AnnouncementsRetrievalException;
 import org.envirocar.app.dao.CacheDirectoryProvider;
+import org.envirocar.app.dao.exception.AnnouncementsRetrievalException;
 import org.envirocar.app.model.Announcement;
-import org.envirocar.app.util.Util;
 import org.json.JSONException;
-import org.json.JSONObject;
 
-public class CacheAnnouncementsDAO implements AnnouncementsDAO {
+public class CacheAnnouncementsDAO extends AbstractCacheDAO implements AnnouncementsDAO {
 
 	public static final String CACHE_FILE_NAME = "announcements";
-	private CacheDirectoryProvider cacheProvider;
 
 	public CacheAnnouncementsDAO(CacheDirectoryProvider cacheDirectoryProvider) {
-		this.cacheProvider = cacheDirectoryProvider;
+		super(cacheDirectoryProvider);
 	}
 
 	@Override
 	public List<Announcement> getAllAnnouncements() throws AnnouncementsRetrievalException {
-		JSONObject content;
 		try {
-			content = Util.readJsonContents(new File(this.cacheProvider.getBaseFolder(), CACHE_FILE_NAME));
-			return Announcement.fromJsonList(content);
+			return Announcement.fromJsonList(readCache(CACHE_FILE_NAME));
 		} catch (IOException e) {
 			throw new AnnouncementsRetrievalException(e);
 		} catch (JSONException e) {
@@ -56,8 +50,7 @@ public List<Announcement> getAllAnnouncements() throws AnnouncementsRetrievalExc
 	}
 
 	public void storeAllAnnouncements(String content) throws IOException {
-		File file = new File(this.cacheProvider.getBaseFolder(), CACHE_FILE_NAME);
-		Util.saveContentsToFile(content, file);
+		storeCache(CACHE_FILE_NAME, content);
 	}
 
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheFuelingDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheFuelingDAO.java
new file mode 100644
index 000000000..fac2b4f76
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheFuelingDAO.java
@@ -0,0 +1,59 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.dao.cache;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.envirocar.app.dao.CacheDirectoryProvider;
+import org.envirocar.app.dao.FuelingDAO;
+import org.envirocar.app.dao.exception.FuelingRetrievalException;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.json.FuelingDecoder;
+import org.envirocar.app.model.Fueling;
+import org.json.JSONException;
+
+public class CacheFuelingDAO extends AbstractCacheDAO implements FuelingDAO {
+
+	
+	public CacheFuelingDAO(CacheDirectoryProvider cacheDirectoryProvider) {
+		super(cacheDirectoryProvider);
+	}
+
+	private static final String FUELING_CACHE = "fuelings";
+
+	@Override
+	public void storeFueling(Fueling fueling) throws NotConnectedException {
+		throw new NotConnectedException("CacheFuelingDAO does not support saving.");
+	}
+
+	@Override
+	public List<Fueling> getFuelings() throws FuelingRetrievalException {
+		try {
+			return new FuelingDecoder().createListFromJson(readCache(FUELING_CACHE));
+		} catch (IOException e) {
+			throw new FuelingRetrievalException(e);
+		} catch (JSONException e) {
+			throw new FuelingRetrievalException(e);
+		}
+	}
+
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheSensorDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheSensorDAO.java
index 8bff79091..da408b14b 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheSensorDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheSensorDAO.java
@@ -20,45 +20,56 @@
  */
 package org.envirocar.app.dao.cache;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
 import org.envirocar.app.dao.CacheDirectoryProvider;
-import org.envirocar.app.dao.NotConnectedException;
 import org.envirocar.app.dao.SensorDAO;
-import org.envirocar.app.dao.SensorRetrievalException;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.SensorRetrievalException;
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.model.Car;
-import org.envirocar.app.util.Util;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class CacheSensorDAO implements SensorDAO {
+public class CacheSensorDAO extends AbstractCacheDAO implements SensorDAO {
 	
 	private static final Logger logger = Logger.getLogger(CacheSensorDAO.class);
 	public static final String CAR_CACHE_FILE_NAME = "cache_cars";
-	private CacheDirectoryProvider cacheDirectoryProvider;
 	
 	public CacheSensorDAO(CacheDirectoryProvider cacheDirectoryProvider) {
-		this.cacheDirectoryProvider = cacheDirectoryProvider;
+		super(cacheDirectoryProvider);
 	}
 
 	@Override
 	public List<Car> getAllSensors() throws SensorRetrievalException {
-		File directory;
 		try {
-			directory = cacheDirectoryProvider.getBaseFolder();
-
-			File f = new File(directory, CAR_CACHE_FILE_NAME);
-
-			if (f.isFile()) {
-				JSONObject cars = Util.readJsonContents(f);
-				return Car.fromJsonList(cars);
-			} 
-			else {
-				throw new SensorRetrievalException("Local cache file could not be accessed.");
+			List<Car> result = null;
+			
+			int c = 1;
+			while (true) {
+				if (cacheFileExists(CAR_CACHE_FILE_NAME+c)) {
+					if (result == null) {
+						result = Car.fromJsonList(readCache(CAR_CACHE_FILE_NAME+c));
+					}
+					else {
+						result.addAll(Car.fromJsonList(readCache(CAR_CACHE_FILE_NAME+c)));
+					}
+				}
+				else {
+					break;
+				}
+				c++;
 			}
+			
+			/*
+			 * fallback for old cache states
+			 */
+			if (result == null) {
+				result = Car.fromJsonList(readCache(CAR_CACHE_FILE_NAME));
+			}
+			
+			return SensorDAOUtil.sortByManufacturer(result);
 		} catch (IOException e) {
 			logger.warn(e.getMessage());
 			throw new SensorRetrievalException(e);
@@ -68,15 +79,17 @@ public List<Car> getAllSensors() throws SensorRetrievalException {
 		}
 	}
 
-	public void storeAllSensors(String content) throws IOException {
-		File carCacheFile = new File(cacheDirectoryProvider.getBaseFolder(), CAR_CACHE_FILE_NAME);
-		Util.saveContentsToFile(content, carCacheFile);		
-	}
-
 	@Override
 	public String saveSensor(Car car) throws NotConnectedException {
 		throw new NotConnectedException("CacheSensorDAO does not support saving.");
 	}
 
+	public void storeAllSensors(List<JSONObject> parentObject) throws IOException {
+		int c = 1;
+		for (JSONObject jsonObject : parentObject) {
+			storeCache(CAR_CACHE_FILE_NAME+(c++), jsonObject.toString());
+		}
+	}
+
 
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheTermsOfUseDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheTermsOfUseDAO.java
index 2f8ae04fa..0eb3b4dd4 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheTermsOfUseDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheTermsOfUseDAO.java
@@ -20,45 +20,30 @@
  */
 package org.envirocar.app.dao.cache;
 
-import java.io.File;
 import java.io.IOException;
 
 import org.envirocar.app.dao.CacheDirectoryProvider;
 import org.envirocar.app.dao.TermsOfUseDAO;
-import org.envirocar.app.dao.TermsOfUseRetrievalException;
+import org.envirocar.app.dao.exception.TermsOfUseRetrievalException;
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.model.TermsOfUse;
 import org.envirocar.app.model.TermsOfUseInstance;
-import org.envirocar.app.util.Util;
 import org.json.JSONException;
-import org.json.JSONObject;
 
-public class CacheTermsOfUseDAO implements TermsOfUseDAO {
+public class CacheTermsOfUseDAO extends AbstractCacheDAO implements TermsOfUseDAO {
 
 	private static final Logger logger = Logger.getLogger(CacheTermsOfUseDAO.class);
 	private static final String LIST_CACHE_FILE_NAME = "tou-list";
 	private static final String INSTANCE_CACHE_FILE_NAME = "tou-instance-";
-	private CacheDirectoryProvider cacheDirectoryProvider;
 
 	public CacheTermsOfUseDAO(CacheDirectoryProvider cacheDirectoryProvider) {
-		this.cacheDirectoryProvider = cacheDirectoryProvider;
+		super(cacheDirectoryProvider);
 	}
 
 	@Override
 	public TermsOfUse getTermsOfUse() throws TermsOfUseRetrievalException {
-		File directory;
 		try {
-			directory = cacheDirectoryProvider.getBaseFolder();
-
-			File f = new File(directory, LIST_CACHE_FILE_NAME);
-
-			if (f.isFile()) {
-				JSONObject tou = Util.readJsonContents(f);
-				return TermsOfUse.fromJson(tou);
-			} 
-			else {
-				throw new TermsOfUseRetrievalException("Local cache file could not be accessed.");
-			}
+			return TermsOfUse.fromJson(readCache(LIST_CACHE_FILE_NAME));
 		} catch (IOException e) {
 			logger.warn(e.getMessage());
 			throw new TermsOfUseRetrievalException(e);
@@ -68,22 +53,10 @@ public TermsOfUse getTermsOfUse() throws TermsOfUseRetrievalException {
 		}
 	}
 
-
 	@Override
 	public TermsOfUseInstance getTermsOfUseInstance(String id) throws TermsOfUseRetrievalException {
-		File directory;
 		try {
-			directory = cacheDirectoryProvider.getBaseFolder();
-
-			File f = new File(directory, INSTANCE_CACHE_FILE_NAME+id);
-
-			if (f.isFile()) {
-				JSONObject tou = Util.readJsonContents(f);
-				return TermsOfUseInstance.fromJson(tou);
-			} 
-			else {
-				throw new TermsOfUseRetrievalException("Local cache file could not be accessed.");
-			}
+			return TermsOfUseInstance.fromJson(readCache(INSTANCE_CACHE_FILE_NAME+id));
 		} catch (IOException e) {
 			logger.warn(e.getMessage());
 			throw new TermsOfUseRetrievalException(e);
@@ -94,13 +67,11 @@ public TermsOfUseInstance getTermsOfUseInstance(String id) throws TermsOfUseRetr
 	}
 
 	public void storeTermsOfUse(String content) throws IOException {
-		File cacheFile = new File(cacheDirectoryProvider.getBaseFolder(), LIST_CACHE_FILE_NAME);
-		Util.saveContentsToFile(content, cacheFile);		
+		storeCache(LIST_CACHE_FILE_NAME, content);
 	}
 
 	public void storeTermsOfUseInstance(String content, String id) throws IOException {
-		File cacheFile = new File(cacheDirectoryProvider.getBaseFolder(), INSTANCE_CACHE_FILE_NAME+id);
-		Util.saveContentsToFile(content, cacheFile);				
+		storeCache(INSTANCE_CACHE_FILE_NAME+id, content);
 	}
 	
 
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheTrackDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheTrackDAO.java
index f1874cb86..a55f7fa4f 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheTrackDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheTrackDAO.java
@@ -22,8 +22,9 @@
 
 import java.util.List;
 
-import org.envirocar.app.dao.NotConnectedException;
 import org.envirocar.app.dao.TrackDAO;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.TrackRetrievalException;
 import org.envirocar.app.storage.Track;
 
 public class CacheTrackDAO implements TrackDAO {
@@ -34,20 +35,41 @@ public void deleteTrack(String remoteID) throws NotConnectedException {
 	}
 
 	@Override
-	public void storeTrack(Track track) throws NotConnectedException {
+	public String storeTrack(Track track, boolean obfuscate) throws NotConnectedException {
 		throw new NotConnectedException("Not implemented for Cache DAO");
 	}
 
 	@Override
-	public List<Track> getAllTracks() {
-		// TODO Auto-generated method stub
-		return null;
+	public Track getTrack(String id) throws NotConnectedException {
+		throw new NotConnectedException("Not implemented for Cache DAO");
+	}
+
+	@Override
+	public Integer getUserTrackCount() throws NotConnectedException,
+			TrackRetrievalException {
+		throw new NotConnectedException("Not implemented for Cache DAO");
+	}
+
+	@Override
+	public Integer getTotalTrackCount() throws NotConnectedException,
+			TrackRetrievalException {
+		throw new NotConnectedException("Not implemented for Cache DAO");
+	}
+
+	@Override
+	public List<String> getTrackIds() throws NotConnectedException {
+		throw new NotConnectedException("Not implemented for Cache DAO");	
+	}
+
+	@Override
+	public List<String> getTrackIds(int limit) throws NotConnectedException {
+		throw new NotConnectedException("Not implemented for Cache DAO");	
 	}
 
 	@Override
-	public Track getTrack(String id) {
-		// TODO Auto-generated method stub
-		return null;
+	public List<String> getTrackIds(int limit, int page)
+			throws NotConnectedException {
+		throw new NotConnectedException("Not implemented for Cache DAO");	
 	}
 
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheUserDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheUserDAO.java
index f084606c0..98bfe7e47 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheUserDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/cache/CacheUserDAO.java
@@ -21,7 +21,27 @@
 package org.envirocar.app.dao.cache;
 
 import org.envirocar.app.dao.UserDAO;
+import org.envirocar.app.dao.exception.ResourceConflictException;
+import org.envirocar.app.dao.exception.UserRetrievalException;
+import org.envirocar.app.dao.exception.UserUpdateException;
+import org.envirocar.app.model.User;
 
 public class CacheUserDAO implements UserDAO {
 
+	@Override
+	public void updateUser(User user) throws UserUpdateException {
+		throw new UserUpdateException("Not supported by Cache");
+	}
+
+	@Override
+	public User getUser(String id) throws UserRetrievalException {
+		throw new UserRetrievalException("Not supported by Cache");
+	}
+
+	@Override
+	public void createUser(User newUser) throws UserUpdateException,
+			ResourceConflictException {
+		throw new UserUpdateException("Not supported by Cache");
+	}
+
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/AnnouncementsRetrievalException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/AnnouncementsRetrievalException.java
similarity index 96%
rename from org.envirocar.app/src/org/envirocar/app/dao/AnnouncementsRetrievalException.java
rename to org.envirocar.app/src/org/envirocar/app/dao/exception/AnnouncementsRetrievalException.java
index 584a4f5c7..a37f0ac95 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/AnnouncementsRetrievalException.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/AnnouncementsRetrievalException.java
@@ -18,7 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  * 
  */
-package org.envirocar.app.dao;
+package org.envirocar.app.dao.exception;
+
 
 public class AnnouncementsRetrievalException extends DAOException {
 
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/DAOException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/DAOException.java
similarity index 96%
rename from org.envirocar.app/src/org/envirocar/app/dao/DAOException.java
rename to org.envirocar.app/src/org/envirocar/app/dao/exception/DAOException.java
index c732921dd..aeda8ad0b 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/DAOException.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/DAOException.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  * 
  */
-package org.envirocar.app.dao;
+package org.envirocar.app.dao.exception;
 
 public class DAOException extends Exception {
 
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/exception/FuelingRetrievalException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/FuelingRetrievalException.java
new file mode 100644
index 000000000..af671ead4
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/FuelingRetrievalException.java
@@ -0,0 +1,34 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.dao.exception;
+
+public class FuelingRetrievalException extends Exception {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public FuelingRetrievalException(Exception e) {
+		super(e);
+	}
+	
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/NotConnectedException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/NotConnectedException.java
similarity index 78%
rename from org.envirocar.app/src/org/envirocar/app/dao/NotConnectedException.java
rename to org.envirocar.app/src/org/envirocar/app/dao/exception/NotConnectedException.java
index 01dfdea49..b51eab85d 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/NotConnectedException.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/NotConnectedException.java
@@ -18,9 +18,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  * 
  */
-package org.envirocar.app.dao;
+package org.envirocar.app.dao.exception;
+
 
-import java.io.IOException;
 
 public class NotConnectedException extends DAOException {
 
@@ -28,13 +28,24 @@ public class NotConnectedException extends DAOException {
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
+	private int httpStatus;
 
 	public NotConnectedException(String m) {
 		super(m);
 	}
 
-	public NotConnectedException(IOException e) {
+	public NotConnectedException(Exception e) {
+		super(e);
+	}
+
+	public NotConnectedException(Exception e, int httpStatusCode) {
 		super(e);
+		this.httpStatus = httpStatusCode;
 	}
+
+	public int getHttpStatus() {
+		return httpStatus;
+	}
+	
 	
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/remote/NotLoggedInException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/ResourceConflictException.java
similarity index 82%
rename from org.envirocar.app/src/org/envirocar/app/dao/remote/NotLoggedInException.java
rename to org.envirocar.app/src/org/envirocar/app/dao/exception/ResourceConflictException.java
index a4a273bc7..8d9e7cfa6 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/remote/NotLoggedInException.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/ResourceConflictException.java
@@ -18,19 +18,17 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  * 
  */
-package org.envirocar.app.dao.remote;
+package org.envirocar.app.dao.exception;
 
-import org.envirocar.app.dao.DAOException;
-
-public class NotLoggedInException extends DAOException {
-
-	public NotLoggedInException() {
-		super("Not logged in");
-	}
+public class ResourceConflictException extends DAOException {
 
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
 
+	public ResourceConflictException(String error) {
+		super(error);
+	}
+
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/SensorRetrievalException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/SensorRetrievalException.java
similarity index 96%
rename from org.envirocar.app/src/org/envirocar/app/dao/SensorRetrievalException.java
rename to org.envirocar.app/src/org/envirocar/app/dao/exception/SensorRetrievalException.java
index 63cc6aaf8..d91738806 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/SensorRetrievalException.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/SensorRetrievalException.java
@@ -18,7 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  * 
  */
-package org.envirocar.app.dao;
+package org.envirocar.app.dao.exception;
+
 
 public class SensorRetrievalException extends DAOException {
 
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/TermsOfUseRetrievalException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/TermsOfUseRetrievalException.java
similarity index 96%
rename from org.envirocar.app/src/org/envirocar/app/dao/TermsOfUseRetrievalException.java
rename to org.envirocar.app/src/org/envirocar/app/dao/exception/TermsOfUseRetrievalException.java
index 309fb8f8f..8313384fb 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/TermsOfUseRetrievalException.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/TermsOfUseRetrievalException.java
@@ -18,7 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  * 
  */
-package org.envirocar.app.dao;
+package org.envirocar.app.dao.exception;
+
 
 
 public class TermsOfUseRetrievalException extends DAOException {
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/exception/TrackRetrievalException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/TrackRetrievalException.java
new file mode 100644
index 000000000..864bb1fb1
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/TrackRetrievalException.java
@@ -0,0 +1,39 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.dao.exception;
+
+
+public class TrackRetrievalException extends DAOException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public TrackRetrievalException(String string) {
+		super(string);
+	}
+
+	public TrackRetrievalException(Exception e) {
+		super(e);
+	}
+
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/exception/TrackSerializationException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/TrackSerializationException.java
new file mode 100644
index 000000000..582058177
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/TrackSerializationException.java
@@ -0,0 +1,39 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.dao.exception;
+
+public class TrackSerializationException extends DAOException {
+
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public TrackSerializationException(String string) {
+		super(string);
+	}
+
+	public TrackSerializationException(Exception e) {
+		super(e);
+	}
+	
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/remote/UnauthorizedException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/UnauthorizedException.java
similarity index 86%
rename from org.envirocar.app/src/org/envirocar/app/dao/remote/UnauthorizedException.java
rename to org.envirocar.app/src/org/envirocar/app/dao/exception/UnauthorizedException.java
index be0f67e43..851336633 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/remote/UnauthorizedException.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/UnauthorizedException.java
@@ -18,11 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  * 
  */
-package org.envirocar.app.dao.remote;
+package org.envirocar.app.dao.exception;
 
-import org.envirocar.app.dao.NotConnectedException;
 
-public class UnauthorizedException extends NotConnectedException {
+public class UnauthorizedException extends DAOException {
 
 	public UnauthorizedException(String m) {
 		super(m);
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/exception/UserRetrievalException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/UserRetrievalException.java
new file mode 100644
index 000000000..531835096
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/UserRetrievalException.java
@@ -0,0 +1,39 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.dao.exception;
+
+
+public class UserRetrievalException extends DAOException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public UserRetrievalException(String string) {
+		super(string);
+	}
+
+	public UserRetrievalException(Exception e) {
+		super(e);
+	}	
+
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/exception/UserUpdateException.java b/org.envirocar.app/src/org/envirocar/app/dao/exception/UserUpdateException.java
new file mode 100644
index 000000000..b214b0444
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/dao/exception/UserUpdateException.java
@@ -0,0 +1,40 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.dao.exception;
+
+
+public class UserUpdateException extends DAOException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public UserUpdateException(String string) {
+		super(string);
+	}
+
+	public UserUpdateException(Exception e) {
+		super(e);
+	}	
+
+	
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/remote/BaseRemoteDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/remote/BaseRemoteDAO.java
index 4c18d67b0..519355e36 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/remote/BaseRemoteDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/remote/BaseRemoteDAO.java
@@ -21,55 +21,293 @@
 package org.envirocar.app.dao.remote;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.zip.GZIPInputStream;
 
+import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
+import org.apache.http.ParseException;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpUriRequest;
-import org.envirocar.app.application.User;
+import org.envirocar.app.application.ECApplication;
 import org.envirocar.app.application.UserManager;
-import org.envirocar.app.dao.NotConnectedException;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.ResourceConflictException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
+import org.envirocar.app.exception.ServerException;
+import org.envirocar.app.model.User;
 import org.envirocar.app.network.HTTPClient;
+import org.envirocar.app.util.Util;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 
 public abstract class BaseRemoteDAO {
 	
-	HttpResponse executeHttpRequest(HttpUriRequest request) throws NotConnectedException {
+	private void assertStatusCode(HttpResponse response) throws NotConnectedException, UnauthorizedException, ResourceConflictException {
+		if (response == null || response.getStatusLine() == null) {
+			throw new NotConnectedException("Unsupported server response.");
+		}
+		
+		int httpStatusCode = response.getStatusLine().getStatusCode();
+		
+		if (httpStatusCode >= HttpStatus.SC_MULTIPLE_CHOICES) {
+			String error = null;
+			
+			try {
+				if (response.getEntity() != null) {
+					error = HTTPClient.readResponse(response.getEntity());
+				}
+			} catch (IllegalStateException e) {
+				throw new NotConnectedException(e, httpStatusCode);
+			} catch (ParseException e) {
+				throw new NotConnectedException(e, httpStatusCode);
+			} catch (IOException e) {
+				throw new NotConnectedException(e, httpStatusCode);
+			}
+			
+			if (httpStatusCode == HttpStatus.SC_UNAUTHORIZED ||
+					httpStatusCode == HttpStatus.SC_FORBIDDEN) {
+				throw new UnauthorizedException("Authentication failed: "+httpStatusCode +"; "+ error);
+			}
+			else if (httpStatusCode == HttpStatus.SC_CONFLICT) {
+				throw new ResourceConflictException(error);
+			}
+			else {
+				throw new NotConnectedException("Unsupported Server response: "+httpStatusCode +"; "+ error);
+			}
+		}
+	}
+	
+	
+	private HttpResponse executeHttpRequest(HttpUriRequest request) throws NotConnectedException {
 		if (this instanceof AuthenticatedDAO) {
 			User user = UserManager.instance().getUser();
 			
-			if (user != null) {
+			if (user != null && user.getUsername() != null && user.getToken() != null) {
 				request.addHeader("X-User", user.getUsername());
 				request.addHeader("X-Token", user.getToken());	
 			}
 			
 		}
 		
+		if (!request.containsHeader("Accept-Encoding")) {
+			request.addHeader("Accept-Encoding", "gzip");
+		}
+		
+		/*
+		 * TODO enable client-site gzip if server responeded with that at least once!
+		 */
+		
 		HttpResponse result;
 		try {
 			result = HTTPClient.execute(request);
 		} catch (IOException e) {
 			throw new NotConnectedException(e);
 		}
-		assertStatusCode(result);
 		
 		return result;
 	}
 	
-	private void assertStatusCode(HttpResponse response) throws NotConnectedException {
-		if (response == null || response.getStatusLine() == null) {
-			throw new NotConnectedException("Unsupported server response.");
+	/**
+	 * Reads a remote REST resource
+	 * 
+	 * @param remoteRestResource the sub resource
+	 * @return the remote resource encoded as a {@link JSONObject}
+	 * @throws NotConnectedException
+	 * @throws UnauthorizedException
+	 * @throws IOException
+	 * @throws JSONException
+	 */
+	protected JSONObject readRemoteResource(String remoteRestResource) throws NotConnectedException, UnauthorizedException, IOException, JSONException {
+		HttpGet get = new HttpGet(ECApplication.BASE_URL+remoteRestResource);
+		InputStream response = retrieveHttpContent(get);
+		String content = Util.consumeInputStream(response).toString();
+	
+		JSONObject parentObject = new JSONObject(content);
+		return parentObject;
+	}
+	
+	/**
+	 * Reads a remote REST resource
+	 * 
+	 * @param remoteRestResource the sub resource
+	 * @param complete if the complete resource (all pages) should be read
+	 * @return the remote resource encoded as a {@link JSONObject}
+	 * @throws NotConnectedException
+	 * @throws UnauthorizedException
+	 * @throws IOException
+	 * @throws JSONException
+	 */
+	protected List<JSONObject> readRemoteResource(String remoteRestResource, boolean complete) throws NotConnectedException, UnauthorizedException, IOException, JSONException {
+		if (!complete) {
+			return Collections.singletonList(readRemoteResource(remoteRestResource));
 		}
 		
-		int httpStatusCode = response.getStatusLine().getStatusCode();
+		HttpGet get = new HttpGet(ECApplication.BASE_URL+remoteRestResource+"?limit=100");
+		HttpResponse response = executeContentRequest(get);
 		
-		if (httpStatusCode >= HttpStatus.SC_MULTIPLE_CHOICES) {
-			if (httpStatusCode == HttpStatus.SC_UNAUTHORIZED ||
-					httpStatusCode == HttpStatus.SC_FORBIDDEN) {
-				throw new UnauthorizedException("Authentication failed.");
+		Integer count;
+		try {
+			count = Util.resolveResourceCount(response);
+		} catch (ServerException e) {
+			throw new IOException(e);
+		}
+		
+		if (count > 1) {
+			List<JSONObject> result = new ArrayList<JSONObject>(count);
+			
+			for (int i = 1; i <= count; i++) {
+				result.add(readRemoteResource(remoteRestResource+"?limit=100&page="+i));
 			}
-			else {
-				throw new NotConnectedException("Unsupported server response.");
+			
+			return result;
+		}
+		else {
+			return Collections.singletonList(readRemoteResource(remoteRestResource));
+		}
+	}
+	
+	/**
+	 * execute a request for remote content (e.g. GET) or a request
+	 * which does not expect contents back (e.g. DELETE)
+	 * 
+	 * @param request the request
+	 * @return the response object, containing headers and content
+	 * @throws NotConnectedException
+	 * @throws UnauthorizedException
+	 */
+	protected HttpResponse executeContentRequest(HttpUriRequest request) throws NotConnectedException, UnauthorizedException {
+		HttpResponse result = executeHttpRequest(request);
+		
+		try {
+			assertStatusCode(result);
+		} catch (ResourceConflictException e) {
+			throw new NotConnectedException(e);
+		}
+		
+		return result;
+	}
+	
+	/**
+	 * execute a request which carries payload (e.g. POST, PUT).
+	 * 
+	 * @param request the request
+	 * @param payload the payload as {@link CharSequence}
+	 * @return the response object, containing headers and content
+	 * @throws NotConnectedException
+	 * @throws UnauthorizedException
+	 * @throws ResourceConflictException
+	 */
+	protected HttpResponse executePayloadRequest(HttpEntityEnclosingRequestBase request, CharSequence payload) throws NotConnectedException, UnauthorizedException, ResourceConflictException {
+		try {
+			request.setEntity(preparePayload(payload));
+		} catch (UnsupportedEncodingException e) {
+			throw new NotConnectedException(e);
+		} catch (IOException e) {
+			throw new NotConnectedException(e);
+		}
+		return executePayloadRequest(request);
+	}
+	
+	/**
+	 * execute a request which carries payload (e.g. POST, PUT).
+	 * 
+	 * @param request
+	 * @param payload the payload as byte array
+	 * @return the response object, containing headers and content
+	 * @throws NotConnectedException
+	 * @throws UnauthorizedException
+	 * @throws ResourceConflictException
+	 */
+	protected HttpResponse executePayloadRequest(HttpEntityEnclosingRequestBase request, byte[] payload) throws NotConnectedException, UnauthorizedException, ResourceConflictException {
+		try {
+			request.setEntity(preparePayload(payload));
+		} catch (IOException e) {
+			throw new NotConnectedException(e);
+		}
+		return executePayloadRequest(request);
+	}
+	
+	/**
+	 * execute a request which carries payload (e.g. POST, PUT).
+	 * 
+	 * @param request the request, containing the payload as its {@link HttpEntity}
+	 * @return the response object, containing headers and content
+	 * @throws NotConnectedException
+	 * @throws UnauthorizedException
+	 * @throws ResourceConflictException
+	 */
+	protected HttpResponse executePayloadRequest(HttpEntityEnclosingRequestBase request) throws NotConnectedException, UnauthorizedException, ResourceConflictException {
+		if (!request.containsHeader("Content-Type")) {
+			request.addHeader("Content-Type", "application/json");
+		}
+		
+		HttpResponse result = executeHttpRequest(request);
+		
+		assertStatusCode(result);
+		
+		return result;
+	}
+
+	/**
+	 * Wrap content into an HTTP entity. a GZIP entity is used if
+	 * the content length exceeds {@link HTTPClient#MIN_GZIP_SIZE}.
+	 * 
+	 * @param content the content to wrap
+	 * @return the entity
+	 * @throws UnsupportedEncodingException
+	 * @throws IOException
+	 */
+	protected HttpEntity preparePayload(CharSequence content) throws UnsupportedEncodingException, IOException {
+		return preparePayload(content.toString().getBytes("UTF-8"));
+	}
+	
+	/**
+	 * Wrap content into an HTTP entity. a GZIP entity is used if
+	 * the content length exceeds {@link HTTPClient#MIN_GZIP_SIZE}.
+	 * 
+	 * @param content the content to wrap
+	 * @return the entity
+	 * @throws IOException
+	 */
+	protected HttpEntity preparePayload(byte[] content) throws IOException {
+		return HTTPClient.createEntity(content);
+	}
+	
+	/**
+	 * executes a request and only returns its contents (i.e. no headers are available).
+	 * 
+	 * @param request the request
+	 * @return the content as {@link InputStream}
+	 * @throws NotConnectedException
+	 * @throws IOException
+	 * @throws UnauthorizedException
+	 */
+	protected InputStream retrieveHttpContent(HttpUriRequest request) throws NotConnectedException, IOException, UnauthorizedException {
+		HttpResponse result = executeContentRequest(request);
+		
+		if (result.containsHeader("Transfer-Encoding")) {
+			String enc = result.getFirstHeader("Transfer-Encoding").getValue();
+			if (enc.contains("gzip")) {
+				return new GZIPInputStream(result.getEntity().getContent());
 			}
 		}
+		
+		if (result.containsHeader("Content-Encoding")) {
+			String enc = result.getFirstHeader("Content-Encoding").getValue();
+			if (enc.contains("gzip")) {
+				return new GZIPInputStream(result.getEntity().getContent());
+			}
+		}
+		
+		return result.getEntity().getContent();
 	}
 
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteAnnouncementsDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteAnnouncementsDAO.java
index 6494ab5c6..427b93336 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteAnnouncementsDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteAnnouncementsDAO.java
@@ -23,17 +23,17 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.envirocar.app.application.ECApplication;
 import org.envirocar.app.dao.AnnouncementsDAO;
-import org.envirocar.app.dao.AnnouncementsRetrievalException;
 import org.envirocar.app.dao.cache.CacheAnnouncementsDAO;
+import org.envirocar.app.dao.exception.AnnouncementsRetrievalException;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.model.Announcement;
-import org.envirocar.app.network.HTTPClient;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class RemoteAnnouncementsDAO implements AnnouncementsDAO {
+public class RemoteAnnouncementsDAO extends BaseRemoteDAO implements AnnouncementsDAO {
 
 	private static final Logger logger = Logger.getLogger(RemoteAnnouncementsDAO.class);
 	private CacheAnnouncementsDAO cache;
@@ -46,25 +46,25 @@ public RemoteAnnouncementsDAO(CacheAnnouncementsDAO cacheAnnouncementsDAO) {
 	public List<Announcement> getAllAnnouncements() throws AnnouncementsRetrievalException {
 		
 		try {
-			String content = HTTPClient.executeAndParseJsonRequest(ECApplication.BASE_URL+"/announcements");
+			JSONObject parentObject = readRemoteResource("/announcements");
 		
 			if (cache != null) {
 				try {
-					cache.storeAllAnnouncements(content);
+					cache.storeAllAnnouncements(parentObject.toString());
 				}
 				catch (IOException e) {
 					logger.warn(e.getMessage());
 				}
 			}
 			
-			JSONObject parentObject = new JSONObject(content);
-			
 			return Announcement.fromJsonList(parentObject);
 		} catch (IOException e) {
-			logger.warn(e.getMessage());
 			throw new AnnouncementsRetrievalException(e);
 		} catch (JSONException e) {
-			logger.warn(e.getMessage());
+			throw new AnnouncementsRetrievalException(e);
+		} catch (NotConnectedException e) {
+			throw new AnnouncementsRetrievalException(e);
+		} catch (UnauthorizedException e) {
 			throw new AnnouncementsRetrievalException(e);
 		}
 	}
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteFuelingDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteFuelingDAO.java
new file mode 100644
index 000000000..7a6a1da78
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteFuelingDAO.java
@@ -0,0 +1,76 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.dao.remote;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.http.client.methods.HttpPost;
+import org.envirocar.app.application.ECApplication;
+import org.envirocar.app.application.UserManager;
+import org.envirocar.app.dao.FuelingDAO;
+import org.envirocar.app.dao.cache.CacheFuelingDAO;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.ResourceConflictException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
+import org.envirocar.app.exception.InvalidObjectStateException;
+import org.envirocar.app.json.FuelingEncoder;
+import org.envirocar.app.model.Fueling;
+import org.json.JSONException;
+
+public class RemoteFuelingDAO extends BaseRemoteDAO implements FuelingDAO, AuthenticatedDAO {
+
+	private CacheFuelingDAO cache;
+
+	public RemoteFuelingDAO(CacheFuelingDAO cacheFuelingDAO) {
+		this.cache = cacheFuelingDAO;
+	}
+
+	@Override
+	public void storeFueling(Fueling fueling) throws NotConnectedException, InvalidObjectStateException {
+		String user = UserManager.instance().getUser().getUsername();
+		HttpPost post = new HttpPost(ECApplication.BASE_URL+"/users/"+user+"/fuelings");
+		
+		try {
+			post.setEntity(super.preparePayload(new FuelingEncoder().createFuelingJson(fueling).toString()));
+			super.executePayloadRequest(post);
+		} catch (UnauthorizedException e) {
+			throw new NotConnectedException(e);
+		} catch (ResourceConflictException e) {
+			throw new NotConnectedException(e);
+		} catch (UnsupportedEncodingException e) {
+			throw new NotConnectedException(e);
+		} catch (IOException e) {
+			throw new NotConnectedException(e);
+		} catch (JSONException e) {
+			throw new NotConnectedException(e);
+		}
+	}
+
+	@Override
+	public List<Fueling> getFuelings() {
+		// TODO implement
+		return Collections.emptyList();
+	}
+
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteSensorDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteSensorDAO.java
index ec43eade6..0bfbb05e3 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteSensorDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteSensorDAO.java
@@ -32,13 +32,14 @@
 import org.apache.http.protocol.HTTP;
 import org.envirocar.app.activity.preference.CarSelectionPreference;
 import org.envirocar.app.application.ECApplication;
-import org.envirocar.app.dao.NotConnectedException;
 import org.envirocar.app.dao.SensorDAO;
-import org.envirocar.app.dao.SensorRetrievalException;
 import org.envirocar.app.dao.cache.CacheSensorDAO;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.ResourceConflictException;
+import org.envirocar.app.dao.exception.SensorRetrievalException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.model.Car;
-import org.envirocar.app.network.HTTPClient;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -55,31 +56,44 @@ public RemoteSensorDAO(CacheSensorDAO cacheSensorDAO) {
 	public List<Car> getAllSensors() throws SensorRetrievalException {
 		
 		try {
-			String content = HTTPClient.executeAndParseJsonRequest(ECApplication.BASE_URL+"/sensors");
-		
+			List<JSONObject> parentObject = readRemoteResource("/sensors", true);
+			
 			if (cache != null) {
 				try {
-					cache.storeAllSensors(content);
+					cache.storeAllSensors(parentObject);
 				}
 				catch (IOException e) {
 					logger.warn(e.getMessage());
 				}
 			}
 			
-			JSONObject parentObject = new JSONObject(content);
+			List<Car> result = null;
+			
+			for (JSONObject jsonObject : parentObject) {
+				if (result == null) {
+					result = Car.fromJsonList(jsonObject);
+				}
+				else {
+					result.addAll(Car.fromJsonList(jsonObject));
+				}
+			}
 			
-			return Car.fromJsonList(parentObject);
+			return SensorDAOUtil.sortByManufacturer(result);
 		} catch (IOException e) {
 			logger.warn(e.getMessage());
 			throw new SensorRetrievalException(e);
 		} catch (JSONException e) {
 			logger.warn(e.getMessage());
 			throw new SensorRetrievalException(e);
+		} catch (NotConnectedException e) {
+			throw new SensorRetrievalException(e);
+		} catch (UnauthorizedException e) {
+			throw new SensorRetrievalException(e);
 		}
 	}
 
 	@Override
-	public String saveSensor(Car car) throws NotConnectedException {
+	public String saveSensor(Car car) throws NotConnectedException, UnauthorizedException {
 		String sensorString = String
 				.format(Locale.ENGLISH,
 						"{ \"type\": \"%s\", \"properties\": {\"manufacturer\": \"%s\", \"model\": \"%s\", \"fuelType\": \"%s\", \"constructionYear\": %s, \"engineDisplacement\": %s } }",
@@ -89,24 +103,22 @@ public String saveSensor(Car car) throws NotConnectedException {
 			return registerSensor(sensorString);
 		} catch (IOException e) {
 			throw new NotConnectedException(e);
+		} catch (ResourceConflictException e) {
+			throw new NotConnectedException(e);
 		}
 	}
 	
-	private String registerSensor(String sensorString) throws IOException, NotConnectedException {
+	private String registerSensor(String sensorString) throws IOException, NotConnectedException, UnauthorizedException, ResourceConflictException {
 		
 		HttpPost postRequest = new HttpPost(
 				ECApplication.BASE_URL+"/sensors");
 		
-		postRequest.addHeader("Content-Type", "application/json");
-		
-		postRequest.addHeader("Accept-Encoding", "gzip");
-		
 		StringEntity se = new StringEntity(sensorString);
 		se.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json"));
 		
 		postRequest.setEntity(se);
 		
-		HttpResponse response = super.executeHttpRequest(postRequest);
+		HttpResponse response = super.executePayloadRequest(postRequest);
 		
 		Header[] h = response.getAllHeaders();
 
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteTermsOfUseDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteTermsOfUseDAO.java
index 430a75848..52f8e9738 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteTermsOfUseDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteTermsOfUseDAO.java
@@ -22,18 +22,18 @@
 
 import java.io.IOException;
 
-import org.envirocar.app.application.ECApplication;
 import org.envirocar.app.dao.TermsOfUseDAO;
-import org.envirocar.app.dao.TermsOfUseRetrievalException;
 import org.envirocar.app.dao.cache.CacheTermsOfUseDAO;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.TermsOfUseRetrievalException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.model.TermsOfUse;
 import org.envirocar.app.model.TermsOfUseInstance;
-import org.envirocar.app.network.HTTPClient;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class RemoteTermsOfUseDAO implements TermsOfUseDAO {
+public class RemoteTermsOfUseDAO extends BaseRemoteDAO implements TermsOfUseDAO {
 
 	private static final Logger logger = Logger.getLogger(RemoteTermsOfUseDAO.class);
 	private CacheTermsOfUseDAO cache;
@@ -45,19 +45,17 @@ public RemoteTermsOfUseDAO(CacheTermsOfUseDAO cacheTermsOfUseDAO) {
 	@Override
 	public TermsOfUse getTermsOfUse() throws TermsOfUseRetrievalException {
 		try {
-			String content = HTTPClient.executeAndParseJsonRequest(ECApplication.BASE_URL+"/termsOfUse");
-		
+			JSONObject parentObject = readRemoteResource("/termsOfUse");
+			
 			if (cache != null) {
 				try {
-					cache.storeTermsOfUse(content);
+					cache.storeTermsOfUse(parentObject.toString());
 				}
 				catch (IOException e) {
 					logger.warn(e.getMessage());
 				}
 			}
 			
-			JSONObject parentObject = new JSONObject(content);
-			
 			return TermsOfUse.fromJson(parentObject);
 		} catch (IOException e) {
 			logger.warn(e.getMessage());
@@ -65,25 +63,28 @@ public TermsOfUse getTermsOfUse() throws TermsOfUseRetrievalException {
 		} catch (JSONException e) {
 			logger.warn(e.getMessage());
 			throw new TermsOfUseRetrievalException(e);
+		} catch (NotConnectedException e) {
+			throw new TermsOfUseRetrievalException(e);
+		} catch (UnauthorizedException e) {
+			throw new TermsOfUseRetrievalException(e);
 		}
 	}
 
+
 	@Override
 	public TermsOfUseInstance getTermsOfUseInstance(String id) throws TermsOfUseRetrievalException {
 		try {
-			String content = HTTPClient.executeAndParseJsonRequest(ECApplication.BASE_URL+"/termsOfUse/"+id);
-		
+			JSONObject parentObject = readRemoteResource("/termsOfUse/"+id);
+			
 			if (cache != null) {
 				try {
-					cache.storeTermsOfUseInstance(content, id);
+					cache.storeTermsOfUseInstance(parentObject.toString(), id);
 				}
 				catch (IOException e) {
 					logger.warn(e.getMessage());
 				}
 			}
 			
-			JSONObject parentObject = new JSONObject(content);
-			
 			return TermsOfUseInstance.fromJson(parentObject);
 		} catch (IOException e) {
 			logger.warn(e.getMessage());
@@ -91,6 +92,10 @@ public TermsOfUseInstance getTermsOfUseInstance(String id) throws TermsOfUseRetr
 		} catch (JSONException e) {
 			logger.warn(e.getMessage());
 			throw new TermsOfUseRetrievalException(e);
+		} catch (NotConnectedException e) {
+			throw new TermsOfUseRetrievalException(e);
+		} catch (UnauthorizedException e) {
+			throw new TermsOfUseRetrievalException(e);
 		}
 	}
 
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteTrackDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteTrackDAO.java
index c8b1d86fd..c2e0ecfe3 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteTrackDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteTrackDAO.java
@@ -20,48 +20,154 @@
  */
 package org.envirocar.app.dao.remote;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 
+import org.apache.http.HttpResponse;
+import org.apache.http.ParseException;
 import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
 import org.envirocar.app.application.ECApplication;
-import org.envirocar.app.application.User;
 import org.envirocar.app.application.UserManager;
-import org.envirocar.app.dao.NotConnectedException;
 import org.envirocar.app.dao.TrackDAO;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.ResourceConflictException;
+import org.envirocar.app.dao.exception.TrackRetrievalException;
+import org.envirocar.app.dao.exception.TrackSerializationException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
+import org.envirocar.app.json.TrackDecoder;
+import org.envirocar.app.json.TrackEncoder;
+import org.envirocar.app.model.User;
 import org.envirocar.app.storage.Track;
+import org.envirocar.app.storage.TrackWithoutMeasurementsException;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class RemoteTrackDAO extends BaseRemoteDAO implements TrackDAO, AuthenticatedDAO {
 
 	@Override
-	public void deleteTrack(String remoteID) throws NotLoggedInException, NotConnectedException {
+	public void deleteTrack(String remoteID) throws UnauthorizedException, NotConnectedException {
 		User user = UserManager.instance().getUser();
 		
 		if (user == null) {
-			throw new NotLoggedInException();
+			throw new UnauthorizedException("No User logged in.");
 		}
 		
 		HttpDelete request = new HttpDelete(ECApplication.BASE_URL+"/users/"+
 				user.getUsername()+"/tracks/" + remoteID);
 
-		super.executeHttpRequest(request);
+		super.executeContentRequest(request);
 	}
 
 	@Override
-	public void storeTrack(Track track) {
-		// TODO Auto-generated method stub
+	public String storeTrack(Track track, boolean obfuscate) throws NotConnectedException, TrackWithoutMeasurementsException, TrackSerializationException, TrackRetrievalException {
+		try {
+			JSONObject content = new TrackEncoder().createTrackJson(track, obfuscate);
+			
+			User user = UserManager.instance().getUser();
+			HttpPost post = new HttpPost(String.format("%s/users/%s/tracks", ECApplication.BASE_URL,
+					user.getUsername()));
+			
+			HttpResponse response = executePayloadRequest(post, content.toString());
+			
+			return new TrackDecoder().resolveLocation(response);
+		} catch (JSONException e) {
+			throw new TrackSerializationException(e);
+		} catch (ResourceConflictException e) {
+			throw new NotConnectedException(e);
+		} catch (UnauthorizedException e) {
+			throw new TrackRetrievalException(e);
+		}
+	}
+
+
+	@Override
+	public Track getTrack(String id) throws NotConnectedException {
+		Track result;
+		try {
+			JSONObject parentObject = readRemoteResource("/tracks/"+id);
+			result = new TrackDecoder().fromJson(parentObject);
+		} catch (ParseException e) {
+			throw new NotConnectedException(e);
+		} catch (IOException e) {
+			throw new NotConnectedException(e);
+		} catch (JSONException e) {
+			throw new NotConnectedException(e);
+		} catch (java.text.ParseException e) {
+			throw new NotConnectedException(e);
+		} catch (UnauthorizedException e) {
+			throw new NotConnectedException(e);
+		}
+		
+		return result;
+	}
+
+	@Override
+	public Integer getUserTrackCount() throws NotConnectedException, TrackRetrievalException {
+		User user = UserManager.instance().getUser();
+		HttpGet get = new HttpGet(ECApplication.BASE_URL+"/users/"+user.getUsername()+"/tracks?limit=1");
+		
+		HttpResponse response;
+		try {
+			response = super.executeContentRequest(get);
+		} catch (UnauthorizedException e) {
+			throw new TrackRetrievalException(e);
+		}
+		return new TrackDecoder().resolveTrackCount(response);
+	}
+
+	@Override
+	public Integer getTotalTrackCount() throws NotConnectedException, TrackRetrievalException {
+		HttpGet get = new HttpGet(ECApplication.BASE_URL+"/tracks?limit=1");
 		
+		HttpResponse response;
+		try {
+			response = super.executeContentRequest(get);
+		} catch (UnauthorizedException e) {
+			throw new TrackRetrievalException(e);
+		}
+		return new TrackDecoder().resolveTrackCount(response);
 	}
 
 	@Override
-	public List<Track> getAllTracks() {
-		// TODO Auto-generated method stub
-		return null;
+	public List<String> getTrackIds() throws NotConnectedException, UnauthorizedException {
+		return getTrackIds(100);
 	}
 
 	@Override
-	public Track getTrack(String id) {
-		// TODO Auto-generated method stub
-		return null;
+	public List<String> getTrackIds(int limit) throws NotConnectedException, UnauthorizedException {
+		return getTrackIds(limit, 1);
+	}
+
+	@Override
+	public List<String> getTrackIds(int limit, int page) throws NotConnectedException, UnauthorizedException {
+		User user = UserManager.instance().getUser();
+		HttpGet get = new HttpGet(String.format("%s/users/%s/tracks?limit=%d&page=%d",
+				ECApplication.BASE_URL, user.getUsername(), limit, page));
+		
+		InputStream response;
+		try {
+			response = super.retrieveHttpContent(get);
+		} catch (IOException e1) {
+			throw new NotConnectedException(e1);
+		}
+		
+		List<String> result;
+		try {
+			result = new TrackDecoder().getResourceIds(response);
+		} catch (ParseException e) {
+			throw new NotConnectedException(e);
+		} catch (IOException e) {
+			throw new NotConnectedException(e);
+		} catch (JSONException e) {
+			throw new NotConnectedException(e);
+		}
+		
+		return result;
 	}
 
+
+
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteUserDAO.java b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteUserDAO.java
index 68facd551..62df9f3e5 100644
--- a/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteUserDAO.java
+++ b/org.envirocar.app/src/org/envirocar/app/dao/remote/RemoteUserDAO.java
@@ -20,8 +20,76 @@
  */
 package org.envirocar.app.dao.remote;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.StringEntity;
+import org.envirocar.app.application.ECApplication;
 import org.envirocar.app.dao.UserDAO;
+import org.envirocar.app.dao.exception.NotConnectedException;
+import org.envirocar.app.dao.exception.ResourceConflictException;
+import org.envirocar.app.dao.exception.UnauthorizedException;
+import org.envirocar.app.dao.exception.UserRetrievalException;
+import org.envirocar.app.dao.exception.UserUpdateException;
+import org.envirocar.app.model.User;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class RemoteUserDAO extends BaseRemoteDAO implements UserDAO, AuthenticatedDAO {
+
+	@Override
+	public void updateUser(User user) throws UserUpdateException, UnauthorizedException {
+		HttpPut put = new HttpPut(ECApplication.BASE_URL+"/users/"+user.getUsername());
+		try {
+			put.setEntity(new StringEntity(user.toJson()));
+			super.executePayloadRequest(put);
+		} catch (UnsupportedEncodingException e) {
+			throw new UserUpdateException(e);
+		} catch (JSONException e) {
+			throw new UserUpdateException(e);
+		} catch (NotConnectedException e) {
+			throw new UserUpdateException(e);
+		} catch (ResourceConflictException e) {
+			throw new UserUpdateException(e);
+		}
+	}
+
+	@Override
+	public User getUser(String id) throws UserRetrievalException, UnauthorizedException {
+		try {
+			JSONObject json = readRemoteResource("/users/"+id);
+			return User.fromJson(json);
+		} catch (IOException e) {
+			throw new UserRetrievalException(e);
+		} catch (JSONException e) {
+			throw new UserRetrievalException(e);
+		} catch (NotConnectedException e) {
+			throw new UserRetrievalException(e);
+		}
+		
+	}
 
-public class RemoteUserDAO implements UserDAO {
+	@Override
+	public void createUser(User newUser) throws UserUpdateException, ResourceConflictException {
+		HttpPost post = new HttpPost(ECApplication.BASE_URL+"/users");
+		
+		try {
+			post.setEntity(new StringEntity(newUser.toJson(true)));
+		} catch (UnsupportedEncodingException e) {
+			throw new UserUpdateException(e);
+		} catch (JSONException e) {
+			throw new UserUpdateException(e);
+		}
+		
+		try {
+			executePayloadRequest(post);
+		} catch (NotConnectedException e) {
+			throw new UserUpdateException(e);
+		} catch (UnauthorizedException e) {
+			throw new UserUpdateException(e);
+		}
+	}
 
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/event/GpsSatelliteFix.java b/org.envirocar.app/src/org/envirocar/app/event/GpsSatelliteFix.java
new file mode 100644
index 000000000..d15633829
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/event/GpsSatelliteFix.java
@@ -0,0 +1,42 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.event;
+
+public class GpsSatelliteFix {
+
+	private boolean fix;
+	private int numberOfSats;
+
+	public GpsSatelliteFix(int numberOfSats, boolean fix) {
+		this.numberOfSats = numberOfSats;
+		this.fix = fix;
+	}
+
+	public boolean isFix() {
+		return fix;
+	}
+
+	public int getNumberOfSats() {
+		return numberOfSats;
+	}
+	
+
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/event/GpsSatelliteFixEvent.java b/org.envirocar.app/src/org/envirocar/app/event/GpsSatelliteFixEvent.java
new file mode 100644
index 000000000..53a4ae5f1
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/event/GpsSatelliteFixEvent.java
@@ -0,0 +1,40 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.event;
+
+public class GpsSatelliteFixEvent implements AbstractEvent<GpsSatelliteFix> {
+
+	private GpsSatelliteFix payload;
+
+	public GpsSatelliteFixEvent(GpsSatelliteFix g) {
+		this.payload = g;
+	}
+	
+	public GpsSatelliteFixEvent(int numberOfSats, boolean fix) {
+		this(new GpsSatelliteFix(numberOfSats, fix));
+	}
+
+	@Override
+	public GpsSatelliteFix getPayload() {
+		return this.payload;
+	}
+
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/event/GpsSatelliteFixEventListener.java b/org.envirocar.app/src/org/envirocar/app/event/GpsSatelliteFixEventListener.java
new file mode 100644
index 000000000..c4c3deaac
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/event/GpsSatelliteFixEventListener.java
@@ -0,0 +1,9 @@
+package org.envirocar.app.event;
+
+@SupportedEventClass(supportedClass = GpsSatelliteFixEvent.class)
+public interface GpsSatelliteFixEventListener extends EventListener<GpsSatelliteFixEvent> {
+
+	@Override
+	public void receiveEvent(GpsSatelliteFixEvent event);
+
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/exception/InvalidObjectStateException.java b/org.envirocar.app/src/org/envirocar/app/exception/InvalidObjectStateException.java
new file mode 100644
index 000000000..0766d0464
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/exception/InvalidObjectStateException.java
@@ -0,0 +1,34 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.exception;
+
+public class InvalidObjectStateException extends Exception {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	public InvalidObjectStateException(String string) {
+		super(string);
+	}
+	
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/exception/ServerException.java b/org.envirocar.app/src/org/envirocar/app/exception/ServerException.java
index 9c57705e9..bd869b67f 100644
--- a/org.envirocar.app/src/org/envirocar/app/exception/ServerException.java
+++ b/org.envirocar.app/src/org/envirocar/app/exception/ServerException.java
@@ -11,4 +11,8 @@ public ServerException(Exception e) {
 		super(e);
 	}
 
+	public ServerException(String string) {
+		super(string);
+	}
+
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/json/FuelingDecoder.java b/org.envirocar.app/src/org/envirocar/app/json/FuelingDecoder.java
new file mode 100644
index 000000000..8b0bb3575
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/json/FuelingDecoder.java
@@ -0,0 +1,15 @@
+package org.envirocar.app.json;
+
+import java.util.List;
+
+import org.envirocar.app.model.Fueling;
+import org.json.JSONObject;
+
+public class FuelingDecoder {
+
+	public List<Fueling> createListFromJson(JSONObject readCache) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/json/FuelingEncoder.java b/org.envirocar.app/src/org/envirocar/app/json/FuelingEncoder.java
new file mode 100644
index 000000000..13ad43c13
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/json/FuelingEncoder.java
@@ -0,0 +1,74 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.json;
+
+import org.envirocar.app.exception.InvalidObjectStateException;
+import org.envirocar.app.model.Fueling;
+import org.envirocar.app.util.Util;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Encode {@link Fueling} objects to JSON
+ */
+public class FuelingEncoder {
+	
+	private static final String COMMENT = "comment";
+	private static final String MISSED_FUEL_STOP = "missedFuelStop";
+	private static final String CAR = "car";
+	private static final String FUEL_TYPE = "fuelType";
+	private static final String COST = "cost";
+	private static final String MILEAGE = "mileage";
+	private static final String VOLUME = "volume";
+	private static final String TIME = "time";
+
+	public JSONObject createFuelingJson(Fueling fueling) throws InvalidObjectStateException, JSONException {
+		assertAllRequiredElementsPresent(fueling);
+		
+		JSONObject result = new JSONObject();
+		
+		if (fueling.getComment() != null) {
+			result.put(COMMENT, fueling.getComment());
+		}
+		
+		result.put(MISSED_FUEL_STOP, fueling.isMissedFuelStop());
+		result.put(CAR, fueling.getCar().getId());
+		result.put(FUEL_TYPE, fueling.getCar().getFuelType().toString());
+		result.put(COST, fueling.getCost().toJson());
+		result.put(MILEAGE, fueling.getMileage().toJson());
+		result.put(VOLUME, fueling.getVolume().toJson());
+		result.put(TIME, Util.longToIsoDate(fueling.getTime().getTime()));
+		
+		return result;
+	}
+
+	private void assertAllRequiredElementsPresent(Fueling fueling) throws InvalidObjectStateException {
+		if (fueling.getCost() != null && fueling.getMileage() != null
+				&& fueling.getVolume() != null && fueling.getTime() != null
+				&& fueling.getCar() != null) {
+			return;
+		}
+		
+		throw new  InvalidObjectStateException(
+				"The Fueling object did not contain all required elements.");
+	}
+
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/json/TrackDecoder.java b/org.envirocar.app/src/org/envirocar/app/json/TrackDecoder.java
new file mode 100644
index 000000000..89161c50a
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/json/TrackDecoder.java
@@ -0,0 +1,112 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.json;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.ParseException;
+import org.apache.http.util.EntityUtils;
+import org.envirocar.app.dao.exception.TrackRetrievalException;
+import org.envirocar.app.exception.ServerException;
+import org.envirocar.app.storage.DbAdapterImpl;
+import org.envirocar.app.storage.Track;
+import org.envirocar.app.util.Util;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class TrackDecoder {
+
+	public Integer resolveTrackCount(HttpResponse response) throws TrackRetrievalException {
+		try {
+			return Util.resolveResourceCount(response);
+		} catch (ServerException e) {
+			throw new TrackRetrievalException(e);
+		}
+	}
+
+	public List<String> getResourceIds(InputStream response) throws ParseException, IOException, JSONException {
+		String result = Util.consumeInputStream(response).toString();
+		
+		JSONObject json = new JSONObject(result);
+		
+		JSONArray tracks = json.getJSONArray("tracks");
+		
+		
+		if (tracks != null && tracks.length() > 0) {
+			List<String> list = new ArrayList<String>(tracks.length());
+			
+			JSONObject o;
+			for (int i = 0; i < tracks.length(); i++) {
+				o = tracks.getJSONObject(i);
+				list.add(o.getString("id"));
+			}
+			
+			return list;
+		}
+		
+		return Collections.emptyList();
+	}
+
+	public Track fromJson(HttpEntity content) throws ParseException, IOException, JSONException, java.text.ParseException {
+		String result = EntityUtils.toString(content);
+		return fromJson(new JSONObject(result));
+	}
+
+	public Track fromJson(JSONObject json) throws JSONException, java.text.ParseException {
+		return Track.fromJson(json, DbAdapterImpl.instance());
+	}
+	
+	public Track fromJson(InputStream jsonStream) throws JSONException, java.text.ParseException, IOException {
+		/*
+		 * TODO use GSON or the like to efficiently parse Streams
+		 */
+		CharSequence contents = Util.consumeInputStream(jsonStream);
+		return fromJson(contents);
+	}
+
+	public Track fromJson(CharSequence contents) throws JSONException, java.text.ParseException {
+		return fromJson(new JSONObject(contents.toString()));
+	}
+
+	public String resolveLocation(HttpResponse response) throws TrackRetrievalException {
+		String location = null;
+		Header h = response.getFirstHeader("Location");
+
+		if (h != null) {
+			location = h.getValue();
+		}
+		else {
+			throw new TrackRetrievalException("Could not parse the 'Location' Header.");
+		}
+		
+		String trackid = location.substring(location.lastIndexOf("/")+1, location.length());
+		return trackid;
+	}
+	
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/logging/Logger.java b/org.envirocar.app/src/org/envirocar/app/logging/Logger.java
index 98c963562..79edd9074 100644
--- a/org.envirocar.app/src/org/envirocar/app/logging/Logger.java
+++ b/org.envirocar.app/src/org/envirocar/app/logging/Logger.java
@@ -153,8 +153,10 @@ public void severe(String message, Exception e) {
 
 	public static String convertExceptionToString(Throwable e) {
 		StringBuilder sb = new StringBuilder();
+		sb.append(e.getClass().getCanonicalName());
+		sb.append(": ");
 		sb.append(e.getMessage());
-		sb.append(":");
+		sb.append("; StackTracke: ");
 		sb.append(Util.NEW_LINE_CHAR);
 
 		int count = 0;
diff --git a/org.envirocar.app/src/org/envirocar/app/model/Car.java b/org.envirocar.app/src/org/envirocar/app/model/Car.java
index c1afe85c0..da67ab464 100644
--- a/org.envirocar.app/src/org/envirocar/app/model/Car.java
+++ b/org.envirocar.app/src/org/envirocar/app/model/Car.java
@@ -124,11 +124,13 @@ public String toString() {
 		sb.append(manufacturer);
 		sb.append(" ");
 		sb.append(model);
+		sb.append(" ");
+		sb.append(constructionYear);
 		sb.append(" (");
 		sb.append(fuelType);
 		sb.append(" / ");
-		sb.append(constructionYear);
-		sb.append(")");
+		sb.append(engineDisplacement);
+		sb.append("cc)");
 		return sb.toString();
 	}
 	
@@ -197,7 +199,7 @@ public static List<Car> fromJsonList(JSONObject json) throws JSONException {
 				try {
 					sensors.add(Car.fromJsonWithStrictEngineDisplacement(properties));
 				} catch (JSONException e) {
-					logger.warn(String.format("Car '%s' not supported: %s", carId != null ? carId : "null", e.getMessage()));
+					logger.verbose(String.format("Car '%s' not supported: %s", carId != null ? carId : "null", e.getMessage()));
 				}
 			}	
 		}
@@ -205,6 +207,7 @@ public static List<Car> fromJsonList(JSONObject json) throws JSONException {
 		return sensors;
 	}
 
+
 	public static FuelType resolveFuelType(String foolType) {
 		if (foolType.equals(GASOLINE_STRING)) {
 			return FuelType.GASOLINE;
diff --git a/org.envirocar.app/src/org/envirocar/app/model/Fueling.java b/org.envirocar.app/src/org/envirocar/app/model/Fueling.java
new file mode 100644
index 000000000..663464a1a
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/model/Fueling.java
@@ -0,0 +1,119 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.model;
+
+import java.util.Date;
+
+import org.envirocar.app.activity.LogbookFragment;
+import org.envirocar.app.dao.FuelingDAO;
+
+/**
+ * Simple POJO representing a fueling stop as used by {@link LogbookFragment}
+ * and {@link FuelingDAO}
+ */
+public class Fueling {
+
+	private Car car;
+	private String comment;
+	private NumberWithUOM mileage;
+	private NumberWithUOM cost;
+	private NumberWithUOM volume;
+	private boolean missedFuelStop;
+	private Date time;
+	
+	/**
+	 * @return the car used
+	 */
+	public Car getCar() {
+		return car;
+	}
+	
+	public void setCar(Car type) {
+		this.car = type;
+	}
+	
+	/**
+	 * @return a generic comment
+	 */
+	public String getComment() {
+		return comment;
+	}
+	
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+	
+	/**
+	 * @return the total mileage of the car
+	 */
+	public NumberWithUOM getMileage() {
+		return mileage;
+	}
+	
+	public void setMileage(NumberWithUOM mileage) {
+		this.mileage = mileage;
+	}
+	
+	/**
+	 * @return the financial cost for this fueling
+	 */
+	public NumberWithUOM getCost() {
+		return cost;
+	}
+	
+	public void setCost(NumberWithUOM cost) {
+		this.cost = cost;
+	}
+	
+	/**
+	 * @return the volume for this fueling
+	 */
+	public NumberWithUOM getVolume() {
+		return volume;
+	}
+
+	public void setVolume(NumberWithUOM volume) {
+		this.volume = volume;
+	}
+
+	/**
+	 * @return true if the user implied that he missed
+	 * to log an etry since the last app fueling entry.
+	 */
+	public boolean isMissedFuelStop() {
+		return missedFuelStop;
+	}
+
+	public void setMissedFuelStop(boolean missedFuelStop) {
+		this.missedFuelStop = missedFuelStop;
+	}
+
+	public Date getTime() {
+		return time;
+	}
+
+	public void setTime(Date time) {
+		this.time = time;
+	}
+	
+	
+	
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/model/NumberWithUOM.java b/org.envirocar.app/src/org/envirocar/app/model/NumberWithUOM.java
new file mode 100644
index 000000000..5c004263f
--- /dev/null
+++ b/org.envirocar.app/src/org/envirocar/app/model/NumberWithUOM.java
@@ -0,0 +1,66 @@
+/* 
+ * enviroCar 2013
+ * Copyright (C) 2013  
+ * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ * 
+ */
+package org.envirocar.app.model;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * class for a {@link Number} with an attached
+ * unit of measurement. A phenomenon usually has
+ * a unit.
+ */
+public class NumberWithUOM {
+
+	private Number value;
+	private String unit;
+	
+	public NumberWithUOM(Number val, String unit) {
+		this.value = val;
+		this.unit = unit;
+	}
+
+	public Number getValue() {
+		return value;
+	}
+	
+	public void setValue(Number value) {
+		this.value = value;
+	}
+	
+	public String getUnit() {
+		return unit;
+	}
+	
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+
+	public JSONObject toJson() throws JSONException {
+		JSONObject result = new JSONObject();
+		result.put("value", this.value);
+		result.put("unit", this.unit);
+		return result;
+	}
+	
+	
+	
+}
diff --git a/org.envirocar.app/src/org/envirocar/app/application/User.java b/org.envirocar.app/src/org/envirocar/app/model/User.java
similarity index 60%
rename from org.envirocar.app/src/org/envirocar/app/application/User.java
rename to org.envirocar.app/src/org/envirocar/app/model/User.java
index cd9109d3a..5b301039c 100644
--- a/org.envirocar.app/src/org/envirocar/app/application/User.java
+++ b/org.envirocar.app/src/org/envirocar/app/model/User.java
@@ -19,7 +19,7 @@
  * 
  */
 
-package org.envirocar.app.application;
+package org.envirocar.app.model;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -30,9 +30,14 @@
  */
 public class User {
 
+	private static final String TOU_VERSION = "touVersion";
+	private static final String NAME = "name";
+	private static final String MAIL = "mail";
+	private static final String TOKEN = "token";
 	private String username;
 	private String token;
-	private String acceptedTermsOfUseVersion;
+	private String touVersion;
+	private String mail;
 
 	/**
 	 * Creates a new user with given parameters
@@ -54,6 +59,14 @@ public User(String username, String token) {
 	public String getUsername() {
 		return username;
 	}
+	
+	public void setMail(String mail) {
+		this.mail = mail;
+	}
+	
+	public String getMail() {
+		return mail;
+	}
 
 	/**
 	 * @return the token
@@ -66,12 +79,12 @@ public void setToken(String token2) {
 		this.token = token2;
 	}
 
-	public String getAcceptedTermsOfUseVersion() {
-		return acceptedTermsOfUseVersion;
+	public String getTouVersion() {
+		return touVersion;
 	}
 
-	public void setAcceptedTermsOfUseVersion(String acceptedTermsOfUseVersion) {
-		this.acceptedTermsOfUseVersion = acceptedTermsOfUseVersion;
+	public void setTouVersion(String acceptedTermsOfUseVersion) {
+		this.touVersion = acceptedTermsOfUseVersion;
 	}
 
 	public static User fromJson(String json) throws JSONException {
@@ -80,12 +93,40 @@ public static User fromJson(String json) throws JSONException {
 	}
 
 	public static User fromJson(JSONObject json) throws JSONException {
-		String name = json.getString("name");
-		String touVersion = json.optString("acceptedTermsOfUseVersion", null);
+		String name = json.getString(NAME);
 		User result = new User(name, null);
-		result.setAcceptedTermsOfUseVersion(touVersion);
+		
+		String touVersion = json.optString(TOU_VERSION, null);
+		result.setTouVersion(touVersion);
+		
+		String m = json.optString(MAIL, null);
+		result.setMail(m);
 		return result;
 	}
 
+	public String toJson() throws JSONException {
+		return toJson(false);
+	}
+	
+	public String toJson(boolean withUsernameToken) throws JSONException {
+		JSONObject result = new JSONObject();
+
+		if (getMail() != null) {
+			result.put(MAIL, getMail());
+		}
+		
+		if (getTouVersion() != null) {
+			result.put(TOU_VERSION, getTouVersion());
+		}
+		
+		if (withUsernameToken) {
+			result.put(TOKEN, getToken());
+			result.put(NAME, getUsername());
+		}
+		
+
+		return result.toString();
+	}
+
 	
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/network/HTTPClient.java b/org.envirocar.app/src/org/envirocar/app/network/HTTPClient.java
index e25484b59..b3fcd5aa1 100644
--- a/org.envirocar.app/src/org/envirocar/app/network/HTTPClient.java
+++ b/org.envirocar.app/src/org/envirocar/app/network/HTTPClient.java
@@ -20,7 +20,10 @@
  */
 package org.envirocar.app.network;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.util.zip.GZIPOutputStream;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -30,11 +33,14 @@
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.conn.scheme.Scheme;
 import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.entity.AbstractHttpEntity;
+import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
 import org.envirocar.app.logging.Logger;
 
+import android.net.http.AndroidHttpClient;
+
 /**
  * Utility class to provide secure HTTP network access. 
  * 
@@ -44,6 +50,13 @@
 public class HTTPClient {
 
 	private static final Logger logger = Logger.getLogger(HTTPClient.class);
+	public static final int MIN_GZIP_SIZE = 8192;
+	private static AndroidHttpClient client;
+	
+	static {
+		createClient();
+		setupClient(client);
+	}
 	
 	/**
 	 * execute a http request with a https-capable http client
@@ -53,9 +66,10 @@ public class HTTPClient {
 	 * @throws IOException
 	 */
 	public static HttpResponse execute(HttpUriRequest request) throws IOException {
-		HttpClient client = createClient();
+		AndroidHttpClient client = createClient();
 		try {
-			return client.execute(request);
+			HttpResponse result = client.execute(request);
+			return result;
 		} catch (ClientProtocolException e) {
 			throw e;
 		} catch (IOException e) {
@@ -66,9 +80,11 @@ public static HttpResponse execute(HttpUriRequest request) throws IOException {
 	/**
 	 * @return a https-capable http client
 	 */
-	protected static HttpClient createClient() {
-		HttpClient client = new DefaultHttpClient();
-		setupClient(client);
+	protected synchronized static AndroidHttpClient createClient() {
+		if (client == null) {
+			client = AndroidHttpClient.newInstance("enviroCar-app");
+			setupClient(client);
+		}
 		return client;
 	}
 
@@ -124,5 +140,30 @@ public static HttpEntity executeJsonRequest(String url) throws IOException {
 		HttpResponse response = HTTPClient.execute(getRequest);
 		return response.getEntity();
 	}
+
+	public static HttpEntity createEntity(byte[] data) throws IOException {
+        AbstractHttpEntity entity;
+        if (data.length < MIN_GZIP_SIZE) {
+            entity = new ByteArrayEntity(data);
+        } else {
+            ByteArrayOutputStream arr = new ByteArrayOutputStream();
+            OutputStream zipper = new GZIPOutputStream(arr);
+            zipper.write(data);
+            zipper.close();
+            entity = new ByteArrayEntity(arr.toByteArray());
+            entity.setContentEncoding("gzip");
+        }
+        return entity;
+	}
 	
+	public static synchronized void shutdown() {
+		if (client != null) {
+			try {
+				client.close();
+			}
+			catch (RuntimeException e) {
+				logger.warn(e.getMessage(), e);
+			}
+		}
+	}
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/network/RestClient.java b/org.envirocar.app/src/org/envirocar/app/network/RestClient.java
deleted file mode 100644
index cf9ad9755..000000000
--- a/org.envirocar.app/src/org/envirocar/app/network/RestClient.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/* 
- * enviroCar 2013
- * Copyright (C) 2013  
- * Martin Dueren, Jakob Moellers, Gerald Pape, Christopher Stephan
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
- * 
- */
-
-package org.envirocar.app.network;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Locale;
-
-import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.protocol.HTTP;
-import org.envirocar.app.application.ECApplication;
-import org.envirocar.app.application.User;
-import org.envirocar.app.dao.DAOProvider;
-import org.envirocar.app.dao.SensorDAO;
-import org.envirocar.app.logging.Logger;
-
-import com.loopj.android.http.AsyncHttpClient;
-import com.loopj.android.http.AsyncHttpResponseHandler;
-import com.loopj.android.http.JsonHttpResponseHandler;
-//TODO javadoc
-
-public class RestClient {
-	
-	private static final Logger logger = Logger.getLogger(RestClient.class);
-	
-	private static AsyncHttpClient client;
-	
-	static {
-		resetClient();
-	}
-	
-	/**
-	 * start downloading the latest 5 tracks of the given user.
-	 * 
-	 * @param user the user
-	 * @param token the users token
-	 * @param limit the maximum track count
-	 * @param page the page (/tracks/ is a paging-enabled resource)
-	 * @param handler called on success or failure
-	 */
-	public static void downloadTracks(String user, String token, int limit, int page, JsonHttpResponseHandler handler){
-		get(String.format(Locale.ENGLISH, "%s/users/%s/tracks?limit=%d&page=%d", ECApplication.BASE_URL, user, limit, page),
-			handler, user, token);
-	}
-	
-	/**
-	 * start downloading the latest 5 tracks of the given user.
-	 * 
-	 * @param user the user
-	 * @param token the users token
-	 * @param handler called on success or failure
-	 */
-	public static void downloadTracks(String user, String token, JsonHttpResponseHandler handler){
-		downloadTracks(user, token, 5, 1, handler);
-	}
-	
-	private static void resetClient() {
-		client = new AsyncHttpClient();
-		HTTPClient.setupClient(client.getHttpClient());		
-	}
-
-	@Deprecated
-	public static void deleteRemoteTrack(String user, String token, String id, JsonHttpResponseHandler handler){
-		setHeaders(user, token);
-		client.delete(ECApplication.BASE_URL+"/users/"+user+"/tracks/" + id, handler);
-	}
-	
-	public static void downloadTrack(String user, String token, String id, AsyncHttpResponseHandler handler){
-		get(ECApplication.BASE_URL+"/tracks/"+id, handler, user, token);
-	}
-	
-	/**
-	 * @deprecated Use {@link DAOProvider#getSensorDAO()} / {@link SensorDAO#saveSensor(org.envirocar.app.model.Car, User)}
-	 * instead.
-	 */
-	@Deprecated
-	public static boolean createSensor(String jsonObj, String user, String token, AsyncHttpResponseHandler handler){
-		client.addHeader("Content-Type", "application/json");
-		setHeaders(user, token);
-		
-		try {
-			StringEntity se = new StringEntity(jsonObj);
-			se.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json"));
-			client.post(null, ECApplication.BASE_URL+"/sensors", se, "application/json", handler);		  
-		} catch (UnsupportedEncodingException e) {
-			logger.warn(e.getMessage(), e);
-			return false;
-		}
-		return true;
-	}
-	
-	private static void get(String url, AsyncHttpResponseHandler handler, String user, String token) {		
-		setHeaders(user, token);
-		
-		client.get(url, handler);
-	}
-	
-	private static void put(String url, AsyncHttpResponseHandler handler, String contents, String user, String token) throws UnsupportedEncodingException {		
-		client.addHeader("Content-Type", "application/json");
-		setHeaders(user, token);
-		
-		StringEntity se = new StringEntity(contents);
-		se.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json"));
-
-		client.put(null, url, se, "application/json", handler);
-	}
-
-	private static void setHeaders(String user, String token) {
-		client.addHeader("Accept-Encoding", "gzip");
-		
-		if (user != null)
-			client.addHeader("X-User", user);
-		
-		if (token != null)
-			client.addHeader("X-Token", token);
-		
-	}
-
-	@Deprecated
-	public static void downloadSensors(JsonHttpResponseHandler handler){
-		get(ECApplication.BASE_URL+"/sensors", handler);
-	}
-
-	private static void get(String url, JsonHttpResponseHandler handler) {
-		get(url, handler, null, null);
-	}
-
-
-	public static void updateAcceptedTermsOfUseVersion(User user,
-			String issuedDate, AsyncHttpResponseHandler handler) {
-		String contents = String.format("{\"%s\": \"%s\"}", "acceptedTermsOfUseVersion", issuedDate);
-		try {
-			put(ECApplication.BASE_URL+"/users/"+user.getUsername(), handler, contents, user.getUsername(), user.getToken());
-		} catch (UnsupportedEncodingException e) {
-			logger.warn(e.getMessage(), e);
-		}
-	}
-
-	public static void removeUserSpecificHeaders() {
-		resetClient();
-	}
-}
diff --git a/org.envirocar.app/src/org/envirocar/app/protocol/AbstractSequentialConnector.java b/org.envirocar.app/src/org/envirocar/app/protocol/AbstractSequentialConnector.java
index 902bf6e7d..dc4ca9f29 100644
--- a/org.envirocar.app/src/org/envirocar/app/protocol/AbstractSequentialConnector.java
+++ b/org.envirocar.app/src/org/envirocar/app/protocol/AbstractSequentialConnector.java
@@ -30,8 +30,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.envirocar.app.FeatureFlags;
 import org.envirocar.app.commands.CommonCommand;
 import org.envirocar.app.commands.EngineLoad;
 import org.envirocar.app.commands.FuelSystemStatus;
@@ -53,6 +62,8 @@
 import org.envirocar.app.protocol.exception.ConnectionLostException;
 import org.envirocar.app.protocol.exception.UnmatchedCommandResponseException;
 
+import android.util.Base64;
+
 /**
  * This class acts as the basis for adapters which work
  * in a request/response fashion (in particular, they do not
@@ -81,6 +92,8 @@ public abstract class AbstractSequentialConnector implements OBDConnector {
 	private int searchingCountInARow;
 	private Set<PID> supportedPIDs;
 	private int cycle = 0;
+	private String preferredLambdaProbe;
+	private ExecutorService initializationExecutor = Executors.newSingleThreadExecutor();
 	
 	static {
 //		whitelistedCommandNames.add(new FuelSystemStatus().getCommandName());
@@ -125,6 +138,8 @@ protected List<CommonCommand> getRequestCommands() {
 					requestCommands.add(cmd);
 				}
 			}
+			
+			logger.info("PID supported result: "+requestCommands);
 		} else {
 			requestCommands = new ArrayList<CommonCommand>();
 			requestCommands.add(new Speed());
@@ -138,40 +153,50 @@ protected List<CommonCommand> getRequestCommands() {
 		
 		/*
 		 * XXX: Tryout for Lambda probes. better: do via PIDSupported
+		 * 
 		 */
-		if (cycle % 8 == 0) {
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_1_VOLTAGE));
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_1_CURRENT));	
-		}
-		else if (cycle % 8 == 1) {
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_2_VOLTAGE));
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_2_CURRENT));
-		}
-		else if (cycle % 8 == 2) {
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_3_VOLTAGE));
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_3_CURRENT));
-		}
-		else if (cycle % 8 == 3) {
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_4_VOLTAGE));
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_4_CURRENT));
-		}
-		else if (cycle % 8 == 4) {
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_5_VOLTAGE));
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_5_CURRENT));
-		}
-		else if (cycle % 8 == 5) {
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_6_VOLTAGE));
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_6_CURRENT));
-		}
-		else if (cycle % 8 == 6) {
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_7_VOLTAGE));
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_7_CURRENT));
+		if (this.preferredLambdaProbe == null || this.preferredLambdaProbe.isEmpty()) {
+			if (cycle % 8 == 0) {
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_1_VOLTAGE));
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_1_CURRENT));	
+			}
+			else if (cycle % 8 == 1) {
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_2_VOLTAGE));
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_2_CURRENT));
+			}
+			else if (cycle % 8 == 2) {
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_3_VOLTAGE));
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_3_CURRENT));
+			}
+			else if (cycle % 8 == 3) {
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_4_VOLTAGE));
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_4_CURRENT));
+			}
+			else if (cycle % 8 == 4) {
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_5_VOLTAGE));
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_5_CURRENT));
+			}
+			else if (cycle % 8 == 5) {
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_6_VOLTAGE));
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_6_CURRENT));
+			}
+			else if (cycle % 8 == 6) {
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_7_VOLTAGE));
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_7_CURRENT));
+			}
+			else if (cycle % 8 == 7) {
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_8_VOLTAGE));
+				requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_8_CURRENT));
+			}
 		}
-		else if (cycle % 8 == 7) {
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_8_VOLTAGE));
-			requestCommands.add(O2LambdaProbe.fromPIDEnum(PID.O2_LAMBDA_PROBE_8_CURRENT));
+		else {
+			/*
+			 * we got one positive response, use that
+			 */
+			requestCommands.add(O2LambdaProbe.fromPIDEnum(PIDUtil.fromString(preferredLambdaProbe)));
 		}
 		
+		
 		requestCommands.add(new FuelSystemStatus());
 		requestCommands.add(new ShortTermTrimBank1());
 		requestCommands.add(new LongTermTrimBank1());
@@ -182,8 +207,10 @@ else if (cycle % 8 == 7) {
 	}
 
 	private void onInitializationCommand(CommonCommand cmd) {
-		if (cmd instanceof PIDSupported) {
-			this.supportedPIDs = ((PIDSupported) cmd).getSupportedPIDs();
+		if (cmd instanceof PIDSupported && FeatureFlags.usePIDSupported()) {
+			if (!(cmd.getCommandState() == CommonCommandState.EXECUTION_ERROR)) {
+				this.supportedPIDs = ((PIDSupported) cmd).getSupportedPIDs();
+			}
 		}
 		processInitializationCommand(cmd);
 	}
@@ -306,14 +333,19 @@ private byte[] readResponseLine(CommonCommand cmd) throws IOException {
 
 		Set<Character> ignored = cmd.getIgnoredChars();
 		
-		byte[] buffer = new byte[32];
+		byte[] buffer = new byte[272];
 		int index = 0;
 		// read until '>' arrives
-		while ((char) (b = (byte) inputStream.read()) != cmd.getEndOfLineReceive()) {
+		while (index < buffer.length && (char) (b = (byte) inputStream.read()) != cmd.getEndOfLineReceive()) {
 			if (!ignored.contains((char) b)){
 				buffer[index++] = b;
 			}
 		}
+		
+		if (index > 0) {
+			logger.info("Response read. Data (base64): "+
+					Base64.encodeToString(buffer, 0, index, Base64.DEFAULT));
+		}
 
 		return Arrays.copyOf(buffer, index);
 	}
@@ -329,16 +361,50 @@ public int getSleepTime() {
 	
 	@Override
 	public void executeInitializationCommands() throws IOException, AdapterFailedException {
-		List<CommonCommand> cmds = this.getInitializationCommands();
+		final List<CommonCommand> cmds = this.getInitializationCommands();
+		
+		if (initializationExecutor.isShutdown() || initializationExecutor.isTerminated()) {
+			throw new AdapterFailedException(getClass().getSimpleName());
+		}
+		
+		Future<Boolean> future;
+		try {
+			future = initializationExecutor.submit(new Callable<Boolean>() {
+
+				@Override
+				public Boolean call() throws Exception {
+					try {
+						executeCommands(cmds);
+						executeCommand(new PIDSupported());
+						return true;
+					} catch (UnmatchedCommandResponseException e) {
+						logger.warn("This should never happen!", e);
+					} catch (ConnectionLostException e) {
+						logger.warn("This should never happen!", e);
+					}
+					return false;
+				}
+			});			
+		}
+		catch (RejectedExecutionException e) {
+			throw new AdapterFailedException(getClass().getSimpleName(), e);
+		}
 		
 		try {
-			executeCommands(cmds);
-			executeCommand(new PIDSupported());
-		} catch (UnmatchedCommandResponseException e) {
-			logger.warn("This should never happen!", e);
-		} catch (ConnectionLostException e) {
-			logger.warn("This should never happen!", e);
-		}		
+			Boolean resp = future.get(10, TimeUnit.SECONDS);
+			
+			if (!resp.booleanValue()) {
+				throw new AdapterFailedException("Init commands took too long.");
+			}
+			
+		} catch (InterruptedException e) {
+			throw new AdapterFailedException(e.getMessage());
+		} catch (ExecutionException e) {
+			throw new AdapterFailedException(e.getMessage());
+		} catch (TimeoutException e) {
+			throw new AdapterFailedException(e.getMessage());
+		}
+		
 	}
 	
 	@Override
@@ -359,11 +425,31 @@ public List<CommonCommand> executeRequestCommands() throws IOException, AdapterF
 				logger.warn("Unmatched Response detected! trying to read another line.");
 				readResponseLine(cmd);
 			}
+			
+			/*
+			 * check if we got a positive response from a Lambda probe request
+			 */
+			if (cmd.getCommandState() == CommonCommandState.FINISHED) {
+				evaluateSupportedLambdaCommand(cmd);
+			}
 		}
 		
 		return list;
 	}
 	
+	private void evaluateSupportedLambdaCommand(CommonCommand cmd) {
+		if (this.preferredLambdaProbe != null && !this.preferredLambdaProbe.isEmpty()) {
+			/*
+			 * no action required, we already got what we want
+			 */
+			return;
+		}
+		
+		if (cmd instanceof O2LambdaProbe) {
+			this.preferredLambdaProbe = ((O2LambdaProbe) cmd).getPID();
+		}
+	}
+
 	/**
 	 * Execute a list of commands
 	 * 
@@ -429,7 +515,8 @@ private void executeCommand(CommonCommand cmd) throws AdapterFailedException, IO
 				}
 				break;
 			case EXECUTION_ERROR:
-				logger.debug("Execution Error for " +cmd.getCommandName() +": "+new String(cmd.getRawData()));
+				String raw = cmd.getRawData() == null ? "null" : new String(cmd.getRawData());
+				logger.debug("Execution Error for " +cmd.getCommandName() +": "+raw);
 				this.onBlacklistCandidate(cmd);
 				break;
 				
@@ -459,6 +546,13 @@ private void executeCommand(CommonCommand cmd) throws AdapterFailedException, IO
 		}
 		
 	}
+	
+	@Override
+	public void shutdown() {
+		if (initializationExecutor != null) {
+			initializationExecutor.shutdown();
+		}
+	}
 
 	
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/protocol/AsynchronousResponseThread.java b/org.envirocar.app/src/org/envirocar/app/protocol/AsynchronousResponseThread.java
index d646fa5fb..a38873498 100644
--- a/org.envirocar.app/src/org/envirocar/app/protocol/AsynchronousResponseThread.java
+++ b/org.envirocar.app/src/org/envirocar/app/protocol/AsynchronousResponseThread.java
@@ -135,7 +135,6 @@ public void run() {
 	public List<CommonCommand> pullAvailableCommands() {
 		List<CommonCommand> result;
 		synchronized (this) {
-			logger.info("Buffer Size On pull: "+buffer.size());
 			result = new ArrayList<CommonCommand>(buffer.size());
 			result.addAll(buffer);
 			buffer.clear();
diff --git a/org.envirocar.app/src/org/envirocar/app/protocol/ConnectionListener.java b/org.envirocar.app/src/org/envirocar/app/protocol/ConnectionListener.java
index bee91361e..c90ec638c 100644
--- a/org.envirocar.app/src/org/envirocar/app/protocol/ConnectionListener.java
+++ b/org.envirocar.app/src/org/envirocar/app/protocol/ConnectionListener.java
@@ -36,7 +36,7 @@ public interface ConnectionListener {
 	 * 
 	 * @param e the exception
 	 */
-	public void onConnectionException(IOException e);
+//	public void onConnectionException(IOException e);
 
 	/**
 	 * called when the connetion is verified (= a useful response
diff --git a/org.envirocar.app/src/org/envirocar/app/protocol/OBDCommandLooper.java b/org.envirocar.app/src/org/envirocar/app/protocol/OBDCommandLooper.java
index 8b61e4966..f81d01018 100644
--- a/org.envirocar.app/src/org/envirocar/app/protocol/OBDCommandLooper.java
+++ b/org.envirocar.app/src/org/envirocar/app/protocol/OBDCommandLooper.java
@@ -70,6 +70,7 @@ private enum Phase {
 	private static final Logger logger = Logger.getLogger(OBDCommandLooper.class);
 	protected static final long ADAPTER_TRY_PERIOD = 5000;
 	private static final Integer MAX_PHASE_COUNT = 2;
+	public static final long MAX_NODATA_TIME = 1000 * 60 * 1;
 	
 	private List<OBDConnector> adapterCandidates = new ArrayList<OBDConnector>();
 	private OBDConnector obdAdapter;
@@ -85,6 +86,9 @@ private enum Phase {
 	private ConnectionListener connectionListener;
 	private String deviceName;
 	private Map<Phase, AtomicInteger> phaseCountMap = new HashMap<Phase, AtomicInteger>();
+	private MonitorRunnable monitor;
+	private long lastSuccessfulCommandTime;
+	private boolean userRequestedStop;
 	
 	private Runnable commonCommandsRunnable = new Runnable() {
 		public void run() {
@@ -92,13 +96,14 @@ public void run() {
 				logger.info("Exiting commandHandler.");
 				throw new LooperStoppedException();
 			}
-			logger.debug("Executing Command Commands!");
 			
 			try {
 				executeCommandRequests();
 			} catch (IOException e) {
 				running = false;
-				connectionListener.onConnectionException(e);
+				if (!userRequestedStop) {
+					connectionListener.requestConnectionRetry(e);
+				}
 				logger.info("Exiting commandHandler.");
 				throw new LooperStoppedException();
 			}
@@ -108,7 +113,6 @@ public void run() {
 				throw new LooperStoppedException();
 			}
 			
-			logger.debug("Scheduling the Executiion of Command Commands!");
 			commandExecutionHandler.postDelayed(commonCommandsRunnable, requestPeriod);
 		}
 	};
@@ -142,7 +146,9 @@ public void run() {
 					executeInitializationRequests();
 				} catch (IOException e) {
 					running = false;
-					connectionListener.onConnectionException(e);
+					if (!userRequestedStop) {
+						connectionListener.requestConnectionRetry(e);
+					}
 					logger.info("Exiting commandHandler.");
 					throw new LooperStoppedException();
 				} catch (AdapterFailedException e) {
@@ -216,6 +222,7 @@ public OBDCommandLooper(InputStream in, OutputStream out,
 	
 		this.phaseCountMap.put(Phase.INITIALIZATION, new AtomicInteger());
 		this.phaseCountMap.put(Phase.COMMAND_EXECUTION, new AtomicInteger());
+		
 	}
 	
 	private void determinePreferredAdapter(String deviceName) {
@@ -239,17 +246,27 @@ private void determinePreferredAdapter(String deviceName) {
 	 * stop the command looper. this removes all pending commands.
 	 * This object is no longer executable, a new instance has to
 	 * be created.
+	 * 
+	 * Only use this if the stop is from high-level (e.g. user request)
+	 * and NOT on any kind of exception
 	 */
 	public void stopLooper() {
 		logger.info("stopping the command execution!");
 		this.running = false;
+		this.userRequestedStop = true;
+		
+		if (this.monitor != null) {
+			this.monitor.running = false;
+		}
 	}
 
 	private void executeInitializationRequests() throws IOException, AdapterFailedException {
 		try {
 			this.obdAdapter.executeInitializationCommands();
 		} catch (IOException e) {
-			connectionListener.onConnectionException(e);
+			if (!userRequestedStop) {
+				connectionListener.requestConnectionRetry(e);
+			}
 			running = false;
 			return;
 		}
@@ -270,25 +287,36 @@ private void executeCommandRequests() throws IOException {
 			return;
 		}
 		
+		long time = 0;
 		for (CommonCommand cmd : cmds) {
 			if (cmd.getCommandState() == CommonCommandState.FINISHED) {
 				commandListener.receiveUpdate(cmd);
+				time = cmd.getResultTime();
 			}
 		}
 		
+		if (time != 0) {
+			lastSuccessfulCommandTime = time;
+		}
+		
 	}
 
 	
 	private void switchPhase(Phase phase, IOException reason) {
 		logger.info("Switching to Phase: " +phase + (reason != null ? " / Reason: "+reason.getMessage() : ""));
 		
+		
 		int phaseCount = phaseCountMap.get(phase).incrementAndGet();
 		
 		commandExecutionHandler.removeCallbacks(initializationCommandsRunnable);
 		commandExecutionHandler.removeCallbacks(commonCommandsRunnable);
 		
+		/*
+		 * if we were too often in the same phase (e.g. init),
+		 * request a reconnect
+		 */
 		if (phaseCount >= MAX_PHASE_COUNT) {
-			logger.warn("Too often in phase "+phaseCount);
+			logger.warn("Too often in phase: "+phaseCount);
 			connectionListener.requestConnectionRetry(reason);
 			
 			running = false;
@@ -300,11 +328,7 @@ private void switchPhase(Phase phase, IOException reason) {
 			connectionEstablished = false;
 			obdAdapter = null;
 			
-			adapterCandidates.clear();
-			adapterCandidates.add(new ELM327Connector());
-			adapterCandidates.add(new AposW3Connector());
-			adapterCandidates.add(new OBDLinkMXConnector());
-			adapterCandidates.add(new DriveDeckSportConnector());
+			setupAdapterCandidates();
 			
 			commandExecutionHandler.post(initializationCommandsRunnable);
 			break;
@@ -313,6 +337,9 @@ private void switchPhase(Phase phase, IOException reason) {
 			this.connectionListener.onConnectionVerified();
 			commandExecutionHandler.postDelayed(commonCommandsRunnable, requestPeriod);
 			commandListener.onConnected(deviceName);
+			
+			startMonitoring();
+			
 			break;
 		default:
 			break;
@@ -320,6 +347,26 @@ private void switchPhase(Phase phase, IOException reason) {
 	}
 
 
+
+	private void startMonitoring() {
+		if (this.monitor != null) {
+			this.monitor.running = false;
+		}
+		
+		this.monitor = new MonitorRunnable();
+		new Thread(this.monitor).start();
+	}
+
+
+	private void setupAdapterCandidates() {
+		adapterCandidates.clear();
+		adapterCandidates.add(new ELM327Connector());
+		adapterCandidates.add(new AposW3Connector());
+		adapterCandidates.add(new OBDLinkMXConnector());
+		adapterCandidates.add(new DriveDeckSportConnector());
+	}
+
+
 	private void connectionEstablished() {
 		logger.info("OBD Adapter " + this.obdAdapter.getClass().getName() +
 				" verified the responses. Connection Established!");
@@ -358,17 +405,54 @@ else if (++tries >= this.obdAdapter.getMaximumTriesForInitialization()) {
 			this.obdAdapter.provideStreamObjects(inputStream, outputStream);
 			tries = 0;
 		}
+		
+		if (this.obdAdapter != null) {
+			this.requestPeriod = this.obdAdapter.getPreferredRequestPeriod();
+		}
+	}
+
+	private class MonitorRunnable implements Runnable {
+
+		private boolean running = true;
+		
+		@Override
+		public void run() {
+			Thread.currentThread().setName("OBD-Data-Monitor");
+			while (running) {
+				try {
+					Thread.sleep(MAX_NODATA_TIME / 3);
+				} catch (InterruptedException e) {
+					logger.warn(e.getMessage(), e);
+				}
+				
+				if (!running) return;
+				
+				if (System.currentTimeMillis() - lastSuccessfulCommandTime > MAX_NODATA_TIME) {
+					commandExecutionHandler.removeCallbacks(commonCommandsRunnable);
+					commandExecutionHandler.getLooper().quit();
+					
+					if (OBDCommandLooper.this.obdAdapter != null) {
+						OBDCommandLooper.this.obdAdapter.shutdown();
+					}
+					
+					connectionListener.requestConnectionRetry(new IOException("Waited too long for data."));
+					return;
+				}
+			}
+		}
+		
 	}
 	
 	@Override
 	public void run() {
 		Looper.prepare();
+		logger.info("Command loop started. Hash:"+this.hashCode());
 		commandExecutionHandler = new Handler();
 		switchPhase(Phase.INITIALIZATION, null);
 		try {
 			Looper.loop();
 		} catch (LooperStoppedException e) {
-			logger.info("Command loop stopped.");
+			logger.info("Command loop stopped. Hash:"+this.hashCode());
 		}
 		
 		if (this.obdAdapter != null) {
diff --git a/org.envirocar.app/src/org/envirocar/app/protocol/OBDConnector.java b/org.envirocar.app/src/org/envirocar/app/protocol/OBDConnector.java
index 342557eb7..ade3e090b 100644
--- a/org.envirocar.app/src/org/envirocar/app/protocol/OBDConnector.java
+++ b/org.envirocar.app/src/org/envirocar/app/protocol/OBDConnector.java
@@ -130,5 +130,10 @@ public List<CommonCommand> executeRequestCommands() throws IOException,
 	 */
 	public int getMaximumTriesForInitialization();
 
+	/**
+	 * @return the time in ms the looper should wait between executing the command batch
+	 */
+	public long getPreferredRequestPeriod();
+
 
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/protocol/drivedeck/CycleCommand.java b/org.envirocar.app/src/org/envirocar/app/protocol/drivedeck/CycleCommand.java
index d70535b92..a5bedbf61 100644
--- a/org.envirocar.app/src/org/envirocar/app/protocol/drivedeck/CycleCommand.java
+++ b/org.envirocar.app/src/org/envirocar/app/protocol/drivedeck/CycleCommand.java
@@ -23,6 +23,7 @@
 import java.util.List;
 
 import org.envirocar.app.commands.CommonCommand;
+import org.envirocar.app.commands.PIDUtil;
 
 public class CycleCommand extends CommonCommand {
 	
@@ -74,6 +75,12 @@ public String toString() {
 			public String toString() {
 				return convert("24");
 			}
+		},
+		O2_LAMBDA_PROBE_1_CURRENT {
+			@Override
+			public String toString() {
+				return convert(PIDUtil.PID.O2_LAMBDA_PROBE_1_CURRENT.toString());
+			}
 		};
 		
 		protected String convert(String string) {
diff --git a/org.envirocar.app/src/org/envirocar/app/protocol/drivedeck/DriveDeckSportConnector.java b/org.envirocar.app/src/org/envirocar/app/protocol/drivedeck/DriveDeckSportConnector.java
index 83d53e26e..c063faf37 100644
--- a/org.envirocar.app/src/org/envirocar/app/protocol/drivedeck/DriveDeckSportConnector.java
+++ b/org.envirocar.app/src/org/envirocar/app/protocol/drivedeck/DriveDeckSportConnector.java
@@ -22,8 +22,10 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 import org.envirocar.app.commands.CommonCommand;
 import org.envirocar.app.commands.IntakePressure;
@@ -39,18 +41,21 @@
 import org.envirocar.app.protocol.ResponseParser;
 import org.envirocar.app.protocol.drivedeck.CycleCommand.PID;
 
+import android.util.Base64;
+
 public class DriveDeckSportConnector extends AbstractAsynchronousConnector {
 
 	private static final Logger logger = Logger.getLogger(DriveDeckSportConnector.class);
 	private static final char CARRIAGE_RETURN = '\r';
 	static final char END_OF_LINE_RESPONSE = '>';
+	private static final long SEND_CYCLIC_COMMAND_DELTA = 2500;
 	private Protocol protocol;
 	private String vin;
-	private long firstConnectionResponse;
 	private CycleCommand cycleCommand;
 	private ResponseParser responseParser = new LocalResponseParser();
 	private ConnectionState state = ConnectionState.DISCONNECTED;
-	private boolean send;
+	public long lastResult;
+	private Set<String> loggedPids = new HashSet<String>();
 	
 	private static enum Protocol {
 		CAN11500, CAN11250, CAN29500, CAN29250, KWP_SLOW, KWP_FAST, ISO9141
@@ -71,6 +76,7 @@ private void createCycleCommand() {
 //		pidList.add(PID.SHORT_TERM_FUEL_TRIM);
 //		pidList.add(PID.LONG_TERM_FUEL_TRIM);
 		pidList.add(PID.O2_LAMBDA_PROBE_1_VOLTAGE);
+		pidList.add(PID.O2_LAMBDA_PROBE_1_CURRENT);
 		this.cycleCommand = new CycleCommand(pidList);
 	}
 
@@ -107,12 +113,15 @@ protected void processSupportedPID(byte[] bytes, int start, int count) {
 			
 			pidCmd.setRawData(rawBytes);
 			pidCmd.parseRawData();
-			logger.info(pidCmd.getSupportedPIDs().toArray().toString());
+			
+			if (pidCmd.getCommandState() == CommonCommandState.FINISHED) {
+				logger.info(pidCmd.getSupportedPIDs().toArray().toString());
+			}
 		}
 	}
 
 	private String oneByteToHex(byte b) {
-		String result = Integer.toString(b, 16).toUpperCase(Locale.US);
+		String result = Integer.toString(b & 0xff, 16).toUpperCase(Locale.US);
 		if (result.length() == 1) result = "0".concat(result);
 		return result;
 	}
@@ -163,7 +172,6 @@ private void determineProtocol(String protocolInt) {
 		}
 
 		logger.info("Protocol is: "+ protocol.toString());
-		logger.info("Connected in "+ (System.currentTimeMillis() - firstConnectionResponse) +" ms.");
 		
 		updateConnectionState();
 	}
@@ -178,6 +186,10 @@ public boolean supportsDevice(String deviceName) {
 	private CommonCommand parsePIDResponse(String pid,
 			byte[] rawBytes, long now) {
 		
+		/*
+		 * resulting HEX values are 0x0d additive to the
+		 * default PIDs of OBD. e.g. RPM = 0x19 = 0x0c + 0x0d
+		 */
 		CommonCommand result = null;
 		if (pid.equals("41")) {
 			//Speed
@@ -204,9 +216,8 @@ else if (pid.equals("4D")) {
 			//determine which probe value is returned.
 			result = O2LambdaProbe.fromPIDEnum(org.envirocar.app.commands.PIDUtil.PID.O2_LAMBDA_PROBE_1_VOLTAGE);
 		}
-		else {
-			logger.info("Parsing not yet supported for response:" +pid);
-		}
+
+		oneTimePIDLog(pid, rawBytes);
 		
 		if (result != null) {
 			byte[] rawData = createRawData(rawBytes, result.getResponseTypeID());
@@ -226,6 +237,17 @@ else if (pid.equals("4D")) {
 		return result;
 	}
 
+	private void oneTimePIDLog(String pid, byte[] rawBytes) {
+		if (pid == null || rawBytes == null || rawBytes.length == 0)
+			return;
+		
+		if (!loggedPids.contains(pid)) {
+			logger.info("First response for PID: " +pid +"; Base64: "+
+					Base64.encodeToString(rawBytes, Base64.DEFAULT));
+			loggedPids.add(pid);
+		}
+	}
+
 	private byte[] createRawData(byte[] rawBytes, String type) {
 		byte[] result = new byte[4 + rawBytes.length*2];
 		byte[] typeBytes = type.getBytes();
@@ -234,25 +256,18 @@ private byte[] createRawData(byte[] rawBytes, String type) {
 		result[2] = typeBytes[0];
 		result[3] = typeBytes[1];
 		for (int i = 0; i < rawBytes.length; i++) {
-			String hex = byteToHex(rawBytes[i]);
+			String hex = oneByteToHex(rawBytes[i]);
 			result[(i*2)+4] = (byte) hex.charAt(0);
 			result[(i*2)+1+4] = (byte) hex.charAt(1);
 		}
 		return result;
 	}
 
-	private String byteToHex(byte b) {
-		String result = Integer.toString((int) b, 16);
-		if (result.length() == 1) {
-			result = "0".concat(result);
-		}
-		return result;
-	}
+
 
 	@Override
 	protected List<CommonCommand> getRequestCommands() {
-		if (!send) {
-			send = true;
+		if (System.currentTimeMillis() - lastResult > SEND_CYCLIC_COMMAND_DELTA) {
 			return Collections.singletonList((CommonCommand) cycleCommand);
 		}
 		else {
@@ -289,7 +304,7 @@ public int getMaximumTriesForInitialization() {
 	}
 
 
-	private class LocalResponseParser implements ResponseParser {
+	public class LocalResponseParser implements ResponseParser {
 		@Override
 		public CommonCommand processResponse(byte[] bytes, int start, int count) {
 			if (count <= 0) return null;
@@ -319,6 +334,14 @@ else if (pid.equals("70")) {
 				else if (pid.equals("71")) {
 					processDiscoveredControlUnits(new String(bytes, start+3, count-3));
 				}
+				else if (pid.equals("31")) {
+					// engine on
+					logger.debug("Engine: On");
+				}
+				else if (pid.equals("32")) {
+					// engine off (= RPM < 500)
+					logger.debug("Engine: Off");
+				}
 				
 				else {
 					/*
@@ -330,15 +353,23 @@ else if (pid.equals("71")) {
 					byte[] pidResponseValue = new byte[2];
 					int target;
 					for (int i = start+4; i <= count+start; i++) {
+						target = i-(start+4);
+						if (target >= pidResponseValue.length)
+							break;
+						
 						if ((char) bytes[i] == CycleCommand.TOKEN_SEPARATOR_CHAR)
 							break;
 						
-						target = i-(start+4);
-						if (target >= pidResponseValue.length) break;
 						pidResponseValue[target] = bytes[i];
 					}
 					
-					return parsePIDResponse(pid, pidResponseValue, now);
+					CommonCommand result = parsePIDResponse(pid, pidResponseValue, now);
+					
+					if (result != null) {
+						lastResult = now;
+					}
+					
+					return result;
 				}
 				
 			}
@@ -363,4 +394,9 @@ protected long getSleepTimeBetweenCommands() {
 		return 0;
 	}
 
+	@Override
+	public long getPreferredRequestPeriod() {
+		return 500;
+	}
+
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/protocol/exception/AdapterFailedException.java b/org.envirocar.app/src/org/envirocar/app/protocol/exception/AdapterFailedException.java
index 45f410225..1137e78fe 100644
--- a/org.envirocar.app/src/org/envirocar/app/protocol/exception/AdapterFailedException.java
+++ b/org.envirocar.app/src/org/envirocar/app/protocol/exception/AdapterFailedException.java
@@ -20,6 +20,8 @@
  */
 package org.envirocar.app.protocol.exception;
 
+import java.util.concurrent.RejectedExecutionException;
+
 public class AdapterFailedException extends Exception {
 
 	/**
@@ -31,4 +33,9 @@ public AdapterFailedException(String name) {
 		super("Adapter failed: "+ name);
 	}
 
+	public AdapterFailedException(String name,
+			RejectedExecutionException e) {
+		super("Adapter failed: "+ name, e);
+	}
+
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/protocol/sequential/AposW3Connector.java b/org.envirocar.app/src/org/envirocar/app/protocol/sequential/AposW3Connector.java
index a4428c3e4..9eb9a25dd 100644
--- a/org.envirocar.app/src/org/envirocar/app/protocol/sequential/AposW3Connector.java
+++ b/org.envirocar.app/src/org/envirocar/app/protocol/sequential/AposW3Connector.java
@@ -30,8 +30,11 @@
 import org.envirocar.app.commands.SelectAutoProtocol;
 import org.envirocar.app.commands.StringResultCommand;
 import org.envirocar.app.commands.Timeout;
+import org.envirocar.app.logging.Logger;
 
 public class AposW3Connector extends ELM327Connector {
+	
+	private static final Logger logger = Logger.getLogger(AposW3Connector.class);
 
 	@Override
 	public List<CommonCommand> getInitializationCommands() {
@@ -75,11 +78,25 @@ public ConnectionState connectionState() {
 	}
 
 	private static class AposEchoOff extends EchoOff {
+		
+		@Override
+		public byte[] getOutgoingBytes() {
+			try {
+				/*
+				 * hack for too fast init requests,
+				 * issue observed with Galaxy Nexus (4.3) and VW Tiguan 2013
+				 */
+				Thread.sleep(250);
+			} catch (InterruptedException e) {
+				logger.warn(e.getMessage(), e);
+			}
+			return super.getOutgoingBytes();
+		}
 
 		@Override
 		public boolean responseAlwaysRequired() {
 			return false;
 		}
-
+		
 	}
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/protocol/sequential/ELM327Connector.java b/org.envirocar.app/src/org/envirocar/app/protocol/sequential/ELM327Connector.java
index 5e165b39e..1e4027fac 100644
--- a/org.envirocar.app/src/org/envirocar/app/protocol/sequential/ELM327Connector.java
+++ b/org.envirocar.app/src/org/envirocar/app/protocol/sequential/ELM327Connector.java
@@ -141,7 +141,7 @@ public ConnectionState connectionState() {
 
 	@Override
 	public void shutdown() {
-		
+		super.shutdown();
 	}
 
 	@Override
@@ -155,6 +155,11 @@ public void prepareShutdown() {
 		
 	}
 
+	@Override
+	public long getPreferredRequestPeriod() {
+		return 100;
+	}
+
 
 
 }
diff --git a/org.envirocar.app/src/org/envirocar/app/storage/DbAdapterImpl.java b/org.envirocar.app/src/org/envirocar/app/storage/DbAdapterImpl.java
index 484e8060e..c8e87e491 100644
--- a/org.envirocar.app/src/org/envirocar/app/storage/DbAdapterImpl.java
+++ b/org.envirocar.app/src/org/envirocar/app/storage/DbAdapterImpl.java
@@ -75,6 +75,7 @@ public class DbAdapterImpl implements DbAdapter {
 	public static final String KEY_TRACK_CAR_MANUFACTURER = "car_manufacturer";
 	public static final String KEY_TRACK_CAR_MODEL = "car_model";
 	public static final String KEY_TRACK_CAR_FUEL_TYPE = "fuel_type";
+	public static final String KEY_TRACK_CAR_YEAR = "car_construction_year";
 	public static final String KEY_TRACK_CAR_ENGINE_DISPLACEMENT = "engine_displacement";
 	public static final String KEY_TRACK_CAR_VIN = "vin";
 	public static final String KEY_TRACK_CAR_ID = "carId"; 
@@ -91,12 +92,13 @@ public class DbAdapterImpl implements DbAdapter {
 		KEY_TRACK_CAR_MODEL,
 		KEY_TRACK_CAR_FUEL_TYPE,
 		KEY_TRACK_CAR_ENGINE_DISPLACEMENT,
+		KEY_TRACK_CAR_YEAR,
 		KEY_TRACK_CAR_VIN,
 		KEY_TRACK_CAR_ID
 	};
 
 	private static final String DATABASE_NAME = "obd2";
-	private static final int DATABASE_VERSION = 8;
+	private static final int DATABASE_VERSION = 9;
 	
 	private static final String DATABASE_CREATE = "create table " + TABLE_MEASUREMENT + " " +
 			"(" + KEY_MEASUREMENT_ROWID + " INTEGER primary key autoincrement, " +
@@ -116,6 +118,7 @@ public class DbAdapterImpl implements DbAdapter {
 			KEY_TRACK_CAR_MODEL + " BLOB, " +
 			KEY_TRACK_CAR_FUEL_TYPE + " BLOB, " +
 			KEY_TRACK_CAR_ENGINE_DISPLACEMENT + " BLOB, " +
+			KEY_TRACK_CAR_YEAR + " BLOB, " +
 			KEY_TRACK_CAR_VIN + " BLOB, " +
 			KEY_TRACK_CAR_ID + " BLOB);";
 
@@ -324,6 +327,7 @@ private Car createCarFromCursor(Cursor c) {
 		if (c.getString(c.getColumnIndex(KEY_TRACK_CAR_MANUFACTURER)) == null ||
 				c.getString(c.getColumnIndex(KEY_TRACK_CAR_MODEL)) == null ||
 				c.getString(c.getColumnIndex(KEY_TRACK_CAR_ID)) == null ||
+				c.getString(c.getColumnIndex(KEY_TRACK_CAR_YEAR)) == null ||
 				c.getString(c.getColumnIndex(KEY_TRACK_CAR_FUEL_TYPE)) == null ||
 				c.getString(c.getColumnIndex(KEY_TRACK_CAR_ENGINE_DISPLACEMENT)) == null) {
 			return null;
@@ -334,8 +338,7 @@ private Car createCarFromCursor(Cursor c) {
 		String carId = c.getString(c.getColumnIndex(KEY_TRACK_CAR_ID));
 		FuelType fuelType = FuelType.valueOf(c.getString(c.getColumnIndex(KEY_TRACK_CAR_FUEL_TYPE)));
 		int engineDisplacement = c.getInt(c.getColumnIndex(KEY_TRACK_CAR_ENGINE_DISPLACEMENT));
-		// TODO add construction year to DB
-		int year = 2000;
+		int year = c.getInt(c.getColumnIndex(KEY_TRACK_CAR_YEAR));
 		return new Car(fuelType, manufacturer, model, carId, year, engineDisplacement);
 	}
 
@@ -508,6 +511,7 @@ private ContentValues createDbEntry(Track track) {
 			values.put(KEY_TRACK_CAR_FUEL_TYPE, track.getCar().getFuelType().name());
 			values.put(KEY_TRACK_CAR_ID, track.getCar().getId());
 			values.put(KEY_TRACK_CAR_ENGINE_DISPLACEMENT, track.getCar().getEngineDisplacement());
+			values.put(KEY_TRACK_CAR_YEAR, track.getCar().getConstructionYear());
 		}
 		
 		if (track.getMetadata() != null) {
diff --git a/org.envirocar.app/src/org/envirocar/app/storage/Track.java b/org.envirocar.app/src/org/envirocar/app/storage/Track.java
index f3b52e1e6..756ce3fd0 100644
--- a/org.envirocar.app/src/org/envirocar/app/storage/Track.java
+++ b/org.envirocar.app/src/org/envirocar/app/storage/Track.java
@@ -278,6 +278,7 @@ public void addMeasurement(Measurement measurement) throws TrackAlreadyFinishedE
 				this.dbAdapter.insertNewMeasurement(measurement);
 			} catch (MeasurementsException e) {
 				logger.severe("This should never happen", e);
+				return;
 			}	
 		} else {
 			logger.warn("DbAdapter was null! Could not insert measurement");
diff --git a/org.envirocar.app/src/org/envirocar/app/storage/TrackMetadata.java b/org.envirocar.app/src/org/envirocar/app/storage/TrackMetadata.java
index 4d38c4ab6..db5aa867e 100644
--- a/org.envirocar.app/src/org/envirocar/app/storage/TrackMetadata.java
+++ b/org.envirocar.app/src/org/envirocar/app/storage/TrackMetadata.java
@@ -63,7 +63,7 @@ public TrackMetadata() {
 	
 	public TrackMetadata(Context ctx) {
 		putEntry(APP_VERSION, Util.getVersionString(ctx));
-		putEntry(TOU_VERSION, UserManager.instance().getUser().getAcceptedTermsOfUseVersion());
+		putEntry(TOU_VERSION, UserManager.instance().getUser().getTouVersion());
 	}
 	
 	public void putEntry(String key, String value) {
diff --git a/org.envirocar.app/src/org/envirocar/app/util/Util.java b/org.envirocar.app/src/org/envirocar/app/util/Util.java
index 9e257d1df..abcdb3e2e 100644
--- a/org.envirocar.app/src/org/envirocar/app/util/Util.java
+++ b/org.envirocar.app/src/org/envirocar/app/util/Util.java
@@ -36,6 +36,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Scanner;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
@@ -45,8 +46,14 @@
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.apache.commons.compress.utils.IOUtils;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.envirocar.app.exception.ServerException;
+import org.envirocar.app.json.TrackEncoder;
 import org.envirocar.app.logging.Logger;
 import org.envirocar.app.storage.Measurement;
+import org.envirocar.app.storage.Track;
+import org.envirocar.app.storage.TrackWithoutMeasurementsException;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -241,6 +248,28 @@ public static ByteArrayOutputStream readFileContents(File f)
 	public static JSONObject readJsonContents(File f) throws IOException, JSONException {
 		BufferedReader bufferedReader = new BufferedReader(new FileReader(f));
 
+		CharSequence content = consumeBufferedReader(bufferedReader);
+
+		JSONObject tou = new JSONObject(content.toString());
+		return tou;
+	}
+	
+	public static CharSequence consumeInputStream(InputStream in) throws IOException {
+		Scanner sc = new Scanner(in, "UTF-8");
+		
+		StringBuilder sb = new StringBuilder();
+		String sep = System.getProperty("line.separator");
+		while (sc.hasNext()) {
+			sb.append(sc.nextLine());
+			sb.append(sep);
+		}
+		sc.close();
+		
+		return sb;
+	}
+
+	private static CharSequence consumeBufferedReader(
+			BufferedReader bufferedReader) throws IOException {
 		StringBuilder content = new StringBuilder();
 		String line = "";
 
@@ -249,9 +278,7 @@ public static JSONObject readJsonContents(File f) throws IOException, JSONExcept
 		}
 
 		bufferedReader.close();
-
-		JSONObject tou = new JSONObject(content.toString());
-		return tou;
+		return content;
 	}
 	
     @SuppressLint("NewApi")
@@ -324,7 +351,7 @@ public static void saveContentsToFile(String content, File f) throws IOException
 		bufferedWriter.flush();
 		bufferedWriter.close();
 	}
-
+	
 	/**
 	 * method to get the current version
 	 * 
@@ -358,4 +385,86 @@ public static String getVersionStringShort(Context ctx) throws NameNotFoundExcep
 		return ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), 0).versionName;
 	}
 	
+	/**
+	 * Saves a json object to the sd card
+	 * 
+	 * @param obj
+	 *            the object to save
+	 * @param id 
+	 * @throws IOException 
+	 */
+	public static File saveTrackToSdCard(String obj, String id) throws IOException {
+		File log = new File(resolveExternalStorageBaseFolder(), "enviroCar-track-"+id+".json");
+		saveContentsToFile(obj, log);
+		return log;
+	}
+	
+	
+	public static File saveTrackAndReturnFile(Track t, boolean obfuscate) throws JSONException, TrackWithoutMeasurementsException, IOException{
+		return Util.saveTrackToSdCard(new TrackEncoder().createTrackJson(t, obfuscate).toString(),
+				(t.isRemoteTrack() ? t.getRemoteID() : Long.toString(t.getId())));
+	}
+
+	public static Integer resolveResourceCount(HttpResponse response) throws ServerException {
+		if (response.containsHeader("Link")) {
+			Header[] link = response.getHeaders("Link");
+			
+			for (Header l : link) {
+				Integer result = resolveLastRel(l.getValue());
+				if (result != null) {
+					return result;
+				}
+			}
+			
+			if (link.length > 0 && link[0].getValue() != null) {
+				throw new ServerException("Could not parse the HTTP Header 'Link': "+link[0].getValue());
+			}
+			else {
+				throw new ServerException("Invalid HTTP Header 'Link'");
+			}
+		}
+		else {
+			throw new ServerException("Response did not contain the exepected HTTP Header 'Link'");
+		}		
+	}
+	
+	private static Integer resolveLastRel(String value) {
+		if (value != null) {
+			String[] split = value.split(",");
+			
+			for (String line : split) {
+				if (line.contains("rel=last")) {
+					String[] params = line.split(";");
+					if (params != null && params.length > 0) {
+						return resolvePageValue(params[0]);
+					}
+				}
+			}
+		}
+		return null;
+	}
+	
+	private static Integer resolvePageValue(String sourceUrl) {
+		String url;
+		if (sourceUrl.startsWith("<")) {
+			url = sourceUrl.substring(1, sourceUrl.length()-1);
+		}
+		else {
+			url = sourceUrl;
+		}
+		
+		if (url.contains("?")) {
+			int index = url.indexOf("?")+1;
+			if (index != url.length()) {
+				String params = url.substring(index, url.length());
+				for (String kvp : params.split("&")) {
+					if (kvp.startsWith("page")) {
+						return Integer.parseInt(kvp.substring(kvp.indexOf("page")+5));
+					}
+				}	
+			}
+		}
+		return null;
+	}
+	
 }