password reset works now
Merge branch 'master' of github.com:m87/PGT

Conflicts:
	pgt/db.sqlite3