Comment added app/controllers/admin
Merge branch 'manifestEncryption' of https://github.com/Immanent/diaspora into adding_token_management_models