FS-13 FS-9 Making the EncryptionManager more secure
Merge branch 'master' of https://github.com/Fides-Storage/Client