Merge branch 'master' into super-fdroid

AndroidManifest.xml

@@ -201,11 +201,6 @@
             android:launchMode="singleTop"
             android:parentActivityName=".FDroid"
             android:screenOrientation="portrait" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".views.SelectLocalAppsActivity"