delete file keys from the correct location
always return normalized path
del share keys from correct location
only escape glob pattern
make trash bin aware of system wide mounts with respect to encryption keys
only check for external mount points if the external storage app is enabled
fix getUidAndFilename() test
added helper function to escape glob pattern

Conflicts:

	apps/files_encryption/lib/helper.php
remove wrong closing bracket
Merge pull request #3957 from owncloud/config-glob-fail

OC_Config: handle failure of glob('*.config.php')
Merge pull request #3948 from owncloud/fixing-3934-master

no anonymous upload on files only folders
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
Merge pull request #3958 from owncloud/fixing-3933-master

adding tipsy to the upload button showing the max upload and restoring c...
Merge pull request #3955 from owncloud/cache-scanner-test

Scanner test: ensure mtime in the cache is the same as on the storage to...
Move error handlers from OC_Log to OC\Log\ErrorHandler
Add comment to column definition
Only change integer type when the length is set
Merge pull request #3951 from owncloud/fixing-3936-master

get the real physical folder name for anonymous upload
Merge branch 'master' into fixing-3942-master

Conflicts:
	apps/files/ajax/upload.php
removing unused getSharedItem()