Fixed merge conflicts API/I18n -> Rails 4.2

Merged conflicts

Removed outdated i%() array initializers because they now create arrays of symbols instead of strings

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

fixed methods for removing and generating user tokens

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

deleteing user's api tokens if they switch organisations

renamed config/environment to config/environments which is what rails is looking for. Commented out the DOCX mime type reference because it is already added by rails. Commented out the belongs_to_and has_many line in models/user because it is already defined by rolify gem

Rebased development branch and corrected merge conflicts

Master (#7) ...

* Update license (merging Marta's change that added Univ. of Glasgow to the text)

Update license to include University of Glasgow.

* Added API and Localisation work

API development done by Sam Rust - xsrust
Localisation work done by Damodar Sojka - DamodarSojka

Added API and Localisation work ...

API development done by Sam Rust - xsrust
Localisation work done by Damodar Sojka - DamodarSojka

Updated user model to assign variables to the attr_accessible list so that User profile and Super Admin user updates work

Updated User model so that the edit profile page will save changes

DMPonline4 - RAILS 4.0 (#4) ...

Merging the initial DMPOnline4 codebase into Roadmap

DMPonline4, this code was designed and implemented by the Digital
Curation Centre (DCC)
DMPonline runs in Ruby 2.1 and Rails 4.0, there is a mysql database.