authorize through token with api
Merge branch 'master' into authenticate_with_token

Conflicts:
	app/controllers/tickets_controller.rb
fix test with token