Basic encryption working
Merge branch 'AddEncryption' into develop
Encryption fully implemented
Merge branch 'develop'