forgot and reset password tags
Merge branch 'pr/37'

Conflicts:
	index.html
Merge branch 'master' into gh-pages