Merge pull request #5976 from owncloud/encryption_work_with_public_gallery

Encryption work with public gallery
Merge branch 'master' into encryption_enable_public_upload

Conflicts:
	apps/files_encryption/lib/helper.php
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/keymanager.php
with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter
fix custom routes defined by apps
always show app navigation scrollbar when too many apps in there
prevent shift of app titles caused by scrollbar
prevent shift of app names caused by scrollbar, part 2
fix navbar
Merge pull request #5977 from owncloud/encryption_enable_public_upload

Encryption enable public upload
Merge branch 'master' into encryption_initial_enc_indicator
Fix for IE - an ugly horizontal scrollbar appears

 * for IE9 the nav bar was too narrow
 * for other IEs the width of each app element was to wide and
   cause the horizontal scoll bar - now this content is hidden like
   before this PR
return false if user is in incognito mode
switch from "name" attribute to "id"
Fixed sharing hook to not remove the share before the trashbin

Fixed the hook order between sharing app and trashbin
[tx-robot] updated from transifex
Merge pull request #6086 from owncloud/incognito_mode

return false if user is in incognito mode
fix public preview creation if a user ios logged in
Fix filellist/rename/summary problem

Fixes #6055
This contribution is MIT licensed!
Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash

move files to owners trash
Merge pull request #6088 from owncloud/fix_public_previews

fix public preview creation if a user is logged in