User token and password hasher, git didn't like it in the last commit
Merge remote-tracking branch 'origin/master'