After messing around for quite awhile now with the SQL NOW() and timestamp comparison, I've come to the conclusion it's much better for my sanity to do the expiration check in php - there seems to be some divergence between the way this is handled between SQL setups I've tested. So there you go.
Merge branch 'next' of https://github.com/xisi/php-mpos into next

Conflicts:
	public/include/classes/token.class.php