fixed logout + renammed sign_in to login and sign_out to logout
Merge branch 'api' of https://github.com/Itaelle/AudioWire
Merge branch 'master' of https://github.com/Itaelle/AudioWire
Merge branch 'master' of https://github.com/Itaelle/AudioWire

Conflicts:
	api/app/controllers/tokens_controller.rb
	api/config/routes.rb