Merge changes from TheSerapher's pull/1404 Added re-Captcha to Login Page
no config version inc
Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next

Conflicts:
	public/include/pages/login.inc.php
Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next
Moved csrftoken stuff into a class
added getCurrentIP method to user class
added config option for sitewide csrf protection
specific timing for csrf tokens
clean up pages that use csrftokens
Cleaned up logic of login page csrf protection
added csrf protection to register page
Added method to get description image of csrf token with name
moved sitewide into options portion of the config option
csrf protection for contact form under sitewide config option
changed register to 1 hour token
refactored old token usage in account edit page
Finished cleanup of account edit page
added csrf protection to account edit page under sitewide config
escaped all instances of CTOKEN for csrf in smarty templates
 What a stupid thing of me to miss
UNIX_TIMESTAMP() for time comparison, oops
cleaned up account edit csrf slightly
added csrf protection to workers under sitewide config
added csrf protection to notifications under sitewide config
added csrf protection to invitations under sitewide config
cleaned up login page csrf
cleaned up contactform/contactform page
cleaned up register/register page
moved config->csrf->forms->register to sitewide
added login ip/user/time to notification on login
Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next

Conflicts:
	public/templates/mobile/login/default.tpl
[UPDATE] CSRF protection + User/IP/Date & time added to login notification
 * Adds CSRF protection for multiple pages, see bottom
 * Adds User/IP/Date & time to successful login notification
 * New config option for sitewide CSRF protection
 * Fixed a bug in the contact form
 * Lots of cleanup related to CSRF stuff
 * Increments config version
 * CSRF protection: register, contact, account edit, workers, notifications, and invites
PHPUnit test harness & sample test
updated test readme
cmon readme do what I want
I need to l2markup
fixed test harness