Auth token is sent in the form of a json.
Merge branch 'API_mainfest' of https://github.com/Immanent/diaspora into api

Conflicts:
	app/controllers/authorize_controller.rb