Improve the user's password using phpass
Merge branch master