LDAP Wizard: move raw login filter field from advanced tab to login filter tab for consistency
LDAP Wizard: proper behaviour for raw filter input. remember the editing mode and compose filter only when desired.
LDAP Wizard: clear the cache on save so changes have immediate effect
[wip] make encryption work with public gallery sharing
fix some getShareKey() and getFileKey() calls
make sure that we always use the correct user id
adapt tests to the new code
public upload now also works with encryption enabled
better distinction between userID and keyId
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload

Conflicts:
	apps/files_encryption/lib/stream.php
Merge branch 'master' into encryption_work_with_public_gallery

Conflicts:
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/crypt.php
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
fix getFileKey() call
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
check HTTP Referer to check if we come from public.php or from a internal page.
Necessary to detect public access also if a user is logged in.
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
LDAP: get user photo from LDAP and set it as avatar if available
Enable user backends to provide avatar images
LDAP: user proxy must support canChangeAvatar too
Avatar: accept OC_Image as  in setParameter