Merge branch 'develop' into review_build_process

diff --combined AndroidManifest.xml
index 374151e,951301e..2035a9d
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -92,9 -92,9 +92,9 @@@
          <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
          </activity>
          
 -        <activity     android:name="com.owncloud.android.ui.preview.PreviewImageActivity" />
 +        <activity     android:name=".ui.preview.PreviewImageActivity" />
                        
 -        <activity     android:name="com.owncloud.android.ui.preview.PreviewVideoActivity"
 +        <activity     android:name=".ui.preview.PreviewVideoActivity"
                                        android:label="@string/app_name"
                                        android:theme="@style/Theme.ownCloud.Fullscreen" >
                </activity>        
@@@ -153,8 -153,6 +153,6 @@@
          <service android:name=".media.MediaService" />
          
          <activity android:name=".ui.activity.PinCodeActivity" />
-         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
-         <activity android:name=".extensions.ExtensionsListActivity"></activity>
          <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
          <activity android:name=".ui.activity.ConflictsResolveActivity"/>
          <activity android:name=".ui.activity.GenericExplanationActivity"/>