add token blank condition
Merge branch 'feature/devise-branch' of github.com:mikolajgrzyb/timetracker into feature/devise-branch