It's easier to find errors in the code if an exception is thrown.

Public API OC6 - introduce lib/private

put the current version and edition into a seperate file to simplify

Conflicts:
	lib/util.php

put the current version and edition into a seperate file to simplify packaging. introduce update channels and build version for automated channel updates. More about that later

Conflicts:
	lib/ocsclient.php
	lib/util.php

Shoudn't make a difference in this case but just in case

Conflicts:
	lib/ocsclient.php

don't remember login if the encrypion app is enabled

Conflicts:
	lib/private/vcategories.php

check not only if the keyfile folder exists but also if it contains keyfiles

Public API for OC6+ (includes AppFramework)

Move aborted upload detection into it's own sabedav plugin 

adding privilege check on move and rename operations

cURL does not honour default_socket_timeout

SabreDAV uses cURL for the requests and as this does not honour
default_socket_timeout, setting it is useless and confusing as
people will expect the request to timeout faster than it actually
will do.

One has to use
 curl_setopt($curl, CURLOPT_TIMEOUT, x)
or
 curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x)
but there is currently no way to make SabreDAV pass this to cURL.

add blacklist to txt preview backend

* owncloud/text_preview_blacklist:
  rename variable in testIsTransparent
  rename testTxtBlacklist to txtBlacklist
  move fileView object initialization to testIsTransparent
  use dataProvider for txt blacklist test
  add test for txt blacklist
  add test data for cal and contact preview
  add blacklist to txt preview backend

handle error situation of rename proper

followup of #4032 - makes the settings-button bigger...

followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation

Base defaultavatar text on displayname

Fix #4876