Token admin-tm could not be verifeied.

This just moves code.

Signed-off-by: John Rayes <live627@gmail.com>
Addressing Issue #787

Signed-off-by: M. Colin Blaber <shadow82x@simplemachines.org>
Merge pull request #1057 from Arantor/release-2.1

! House cleaning with PostgreSQL installer file
Merge pull request #988 from live627/token

Token admin-tm could not be verified.
Merge pull request #1048 from mcblaber/pr/951

BBC Button Status Update (Issue #787)