test password hashing
Merge branch 'danny' of https://github.com/ynnadkrap/oat into gk2
merge conf