Make the expiration time configurable for token auth.
Merge branch '7.x-1.x' into 265-admin-ui-token-auth

Conflicts:
	modules/restful_token_auth/includes/RestfulTokenAuthController.php