FREEPBX-8463 token based password reset functionality
allow each token to define its own validity time
Revert 13 changes that made their way into 12
Merge branch 'release/12.0' of https://github.com/FreePBX/userman into release/12.0

* 'release/12.0' of https://github.com/FreePBX/userman:
  allow each token to define its own validity time
  FREEPBX-8463 token based password reset functionality
More reverts
Merge branch 'release/12.0' of https://github.com/FreePBX/userman into release/12.0

* 'release/12.0' of https://github.com/FreePBX/userman:
  Revert 13 changes that made their way into 12
  allow each token to define its own validity time
  FREEPBX-8463 token based password reset functionality
Reverting
reverting
Merge branch 'release/12.0' into release/13.0

Conflicts:
	Userman.class.php