Merge remote-tracking branch 'origin/master'

diff --combined AndroidManifest.xml
index 0a1bac7,bb1f30e..65874d0
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -18,7 -18,7 +18,7 @@@
   -->\r
  <manifest package="eu.alefzero.owncloud"\r
      android:versionCode="1"\r
 -    android:versionName="0.1.140B" xmlns:android="http://schemas.android.com/apk/res/android">\r
 +    android:versionName="0.1.141B" xmlns:android="http://schemas.android.com/apk/res/android">\r
  \r
      <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
      <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
@@@ -160,4 -160,4 +160,4 @@@
          <activity android:name="CrashlogSendActivity"></activity>\r
      </application>\r
  \r
- </manifest>
+ </manifest>