Merge branch 'target_marshmallow' of https://github.com/owncloud/android into beta

Conflicts:
	build.gradle

diff --cc .travis.yml
Simple merge

diff --cc AndroidManifest.xml
Simple merge

diff --cc build.gradle
index ccfce0d,2a39799..8c68fa7
--- 1/build.gradle
--- 2/build.gradle
+++ b/build.gradle
@@@ -27,15 -28,12 +28,18 @@@ dependencies 
  }
  
  android {
-     compileSdkVersion 22
-     buildToolsVersion "22.0.1"
+     compileSdkVersion 23
+     buildToolsVersion "23.0.2"
+     // as long as ownCloud uses Apache HTTP
+     // http://developer.android.com/about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client
+     useLibrary 'org.apache.http.legacy'
  
 +    defaultConfig {
 +        applicationId "com.owncloud.android.beta"
 +        versionCode 20151128
 +        versionName "ownCloud beta"
 +    }
 +
      sourceSets {
          main {
              manifest.srcFile 'AndroidManifest.xml'
@@@ -72,20 -67,10 +76,20 @@@
      packagingOptions {
          exclude 'META-INF/LICENSE.txt'
      }
 -}
 -
 -
 -
  
 +    signingConfigs {
 +        release {
 +            storeFile file(RELEASE_STORE_FILE)
 +            storePassword RELEASE_STORE_PASSWORD
 +            keyAlias RELEASE_KEY_ALIAS
 +            keyPassword RELEASE_KEY_PASSWORD
 +        }
 +    }
  
 +     buildTypes {
 +        release {
 +            signingConfig signingConfigs.release
 +        }
 +    }
  
- }
++}