Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/proxy.php

Conflicts:
	apps/files_encryption/lib/util.php

fix https://github.com/owncloud/core/issues/3320

added OC_DB::isError and logging for #3486

Don't set Content-Length header if size is unknown

Conflicts:
	apps/files_encryption/lib/util.php

fix first time encryption after app was enabled

improved tests for files_encryption

changed to public api where it was possible
reformat code to comply with the coding guidelines

reformat code to meet coding guidelines

- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code

small typo fix: added 2 whitespaces

Duplicate DB entries in filecache table when renaming folder in WebUI #2

Bump version for files_encryption changes

use the recoveryPassword var instead of accessing the POST array