User password encryption added
merge conflicts resolved