#59 - Basic password reset functionality.
Cleaning.
If you click an expired recovery link it no longer sends a new recovery email.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	dashboard/index.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	dashboard/index.php
Merge remote-tracking branch 'upstream/master'
Conflicts:
	dashboard/index.php
Merge branch 'master' into PasswordReset
Changed verification key to be more random.
Merge pull request #63 from JimmyThompson/PasswordReset

#59 - Basic password reset functionality.