Added tests for changing user passwords and fixed a bug in that functionality
Merge branch 'master' into dev