remove unused varaibles
fix tests, after unused variables are removed
Merge branch 'master' into remove_unused_vars

Conflicts:
	apps/files_encryption/lib/util.php
reformat code
replace == with ===
Merge branch 'master' into remove_unused_vars

Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/proxy.php
changed basic auth to test user
replace == with === and replace != with !==
changed to public log api
$_POST["adminEnableRecovery"] is a string
Merge branch 'master' into remove_unused_vars

Conflicts:
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/util.php
Merge branch 'master' into remove_unused_vars

Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/stream.php
changes after review
changes l10n after review
Only update metadata that has changed
Organize conditionals in a better order
Merge pull request #3532 from owncloud/scan-update

Only update metadata that has changed
fix wrong signature delimiter - fix #3523
changed l10n to full sentences
Merge branch 'master' into remove_unused_vars