Encrypting password
Merge branch 'develop'