Adds tests for token authorization
Brings tokens_controller up to 100% coverage
Merge remote-tracking branch 'origin/master'