Encrypted fields management

Encrypting fields in database
Patch for compatibility
Adding tests
remove all the commented section