Merge remote-tracking branch 'origin/master' into long_press

AndroidManifest.xml

@@ -17,8 +17,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="103012"
-    android:versionName="1.3.12" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="103014"
+    android:versionName="1.3.14" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />

src/eu/alefzero/webdav/WebdavEntry.java

@@ -50,6 +50,8 @@ public class WebdavEntry {
                     mName = tmp[tmp.length - 1];
             }
 
+            // use unknown mimetype as default behavior
+            mContentType = "application/octet-stream";
             prop = propSet.get(DavPropertyName.GETCONTENTTYPE);
             if (prop != null) {
                 mContentType = (String) prop.getValue();