Add encrption and descrytion method
Merge branch 'ticket_231' into ticket_210
Add password encryption and decryption