don't remember login if the encrypion app is enabled because the user
needs to log-in again in order to decrypt his private key with his password
introduce OC_Util::rememberLoginAllowed()
check every enabled app if the remember login feature needs to be disabled
set rememberlogin to false for the encryption app
check not only if the keyfile folder exists but also if it contains keyfiles
Merge pull request #5012 from owncloud/check_keyfiles_exists

check not only if the keyfile folder exists but also if it contains keyfiles
[tx-robot] updated from transifex
move the private namespace OC into lib/private - OCP will stay in lib/public

Conflicts:
	lib/private/vcategories.php
reorganize file in lib
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled

don't remember login if the encrypion app is enabled
prepare the updater for the new update channels
use ===
Shoudn't make a difference in this case but just in case

Conflicts:
	lib/ocsclient.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
Merge branch 'master' into channels

Conflicts:
	lib/util.php
use public api for session access from server container
Merge branch 'master' into lib-private-master-2
use a 4 digit number
add explanation
Merge pull request #5026 from owncloud/channels

put the current version and edition into a seperate file to simplify
Merge branch 'master' into lib-private-master-2