add password/change/done url
add template to url
Merge branch 'pwbugs' into develop
Merge branch 'develop'