Checks for token expiry before authenticating
Merge remote-tracking branch 'origin/master'