Fixed index.html.template-changePassword
Fixed parameter names and added checking
Merge branch 'master' of https://github.com/terraflops/SampleSite