authorize controller - access token edited
Merge branch 'API_mainfest' of https://github.com/Immanent/diaspora into API_mainfest
authorize_controller changed