Conflicts:
	apps/files_encryption/lib/keymanager.php

Needs to be implemented and integrated into the settings.

Fixed documentation syntax in keymanager

Changed util class methods to use / create public keys in single shared public-keys directory, and group encryption-related user files

Added more unit tests for crypt class
Added new method for generating 16 character pseudo-random initialisation vectors
Started writing new methods for handling legacy keys and en/de/re cryption
Added comments to lib/filecache.php explaining expected $path type

- Added methods for sealing data with multiple keys
- Added method for encrypting data, generating iv and keyfile, and returning both
- Added 6 unit test cases (containing 12 tests) for Crypt class
- Commented out old unit tests for now

Improved IV generation

Rewrote crtpt class as Util, Hooks, and Crypt
Switched blowfish for openssl with AES
Added setup() method for creating user keys and directory structure
Many other changes complete and in progress

This reverts commit f5c329af.