added crypting to password
Merge branch 'master' into dev