New password function, fix database name
Merge branch 'master' of https://github.com/adaptdk/adapt_scaffold