fix(auth): always use current time from db for token
chore(merge): merge branch 'master' into resource-loading