Merge branch 'master' of https://github.com/DigitalCurationCentre/roadmap

merge

localization based on url

renamed token_permission_type to plural to follow convention of fixtures

added data structures for testing

Merge branch 'adding_api_and_localisation_work'

final commit before merging into master

ensured that users recieve emails about their new tokens upon token being granted

language table, dropdown, additional locales

added link to viewing api information from user's edit profile page

added code for sending email to users when granted api tokens

added view for token_permission_types

added a page for users to view api endpoint information

removed depricated api strucures from the models

fixed methods for removing and generating user tokens

updated path to api_update to allow admin nav

pointed form to the new controller action

added form to admin nav

updated logic for token removal/generation

view now depricated

controller now depricated

modified admin layout

added functions for removing and generating api tokens from the user model

added way to define users api-tokens through users controller

moved old org-admin users index view to new controller, added logic for updating api privleges

added new route to org admin users index

added todo to remind me to destroy the rdoc once docs are switched over

localization further work, including dropdown initial work

added marta's changes to export.pdf.erb and _edit_question.html.erb

added testing for organisations