Renamed algorithm package to encryption package, moved EncryptionManager and removed FileEncryptor
Merge branch 'master' of https://github.com/Fides-Storage/Client

Conflicts:
	src/test/java/org/fides/client/KeyGeneratorTest.java