diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 40d3aa21de..93460e56de 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -5,7 +5,7 @@
 	android:versionCode="201"
 	package="net.osmand.plus">
 
-	<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19" />
+	<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="21" />
 
 
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
index 6887fc1556..7845082179 100644
--- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
@@ -31,11 +31,11 @@ public class HelpActivity extends ActionBarActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		getMyApplication().applyTheme(this);
-		super.onCreate(savedInstanceState);
 		supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
 			getWindow().setUiOptions(ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
 		}
+		super.onCreate(savedInstanceState);
 		wv = new WebView(this);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		String title = getString(R.string.help);
diff --git a/appcompat/.classpath b/appcompat/.classpath
index a4763d1eec..7bc01d9a9c 100644
--- a/appcompat/.classpath
+++ b/appcompat/.classpath
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/appcompat/.gitignore b/appcompat/.gitignore
new file mode 100644
index 0000000000..e614fbbef9
--- /dev/null
+++ b/appcompat/.gitignore
@@ -0,0 +1,2 @@
+bin
+gen
diff --git a/appcompat/gen/android/support/v7/appcompat/BuildConfig.java b/appcompat/gen/android/support/v7/appcompat/BuildConfig.java
deleted file mode 100644
index 4cee8535dc..0000000000
--- a/appcompat/gen/android/support/v7/appcompat/BuildConfig.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package android.support.v7.appcompat;
-
-/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
-public final class BuildConfig {
-  public final static boolean DEBUG = Boolean.parseBoolean(null);
-}
\ No newline at end of file
diff --git a/appcompat/gen/android/support/v7/appcompat/Manifest.java b/appcompat/gen/android/support/v7/appcompat/Manifest.java
deleted file mode 100644
index 3ddf9e5d8b..0000000000
--- a/appcompat/gen/android/support/v7/appcompat/Manifest.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package android.support.v7.appcompat;
-
-/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
-public final class Manifest {
-}
\ No newline at end of file
diff --git a/appcompat/gen/android/support/v7/appcompat/R.java b/appcompat/gen/android/support/v7/appcompat/R.java
deleted file mode 100644
index 5f706f4dde..0000000000
--- a/appcompat/gen/android/support/v7/appcompat/R.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package android.support.v7.appcompat;
-
-/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
-public final class R {
-}
\ No newline at end of file