public upload now also works with encryption enabled
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload

Conflicts:
	apps/files_encryption/lib/stream.php
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
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
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
Merge pull request #5977 from owncloud/encryption_enable_public_upload

Encryption enable public upload