password reset and init functionality
Merge branch 'master' of github.com:trustthevote/CommonServicesFramework

# By TrustTheVote Superuser
# Via TrustTheVote Superuser
* 'master' of github.com:trustthevote/CommonServicesFramework:
  Update pages.en.yml
  Update layouts.en.yml

Conflicts:
	config/locales/pages.en.yml