Merge branch '138-expired-token-checking' into 'dev'

Refresh expired tokens when verifying incoming tokens

Closes #138

See merge request !121