Merge branch 'master' into dmptool

Began removing branding variables from the locales file and placed them in branding.yml

Change name of the application's root module from DMPonline4 to DMPRoadmap

updated en-UK and en-US locale files to make sure that they use their respective locale ids instead of en. Added a branding yaml file for org and app names

Switched the dmptool to use en-US localization

Updated load path on locales initializer so that it understands subdirectories. separated en contact-us locale into en-Uk and en-US. updated contact_us page to use gem's built in localization files

Organized locale files for dependencies into subdirectories

Fixed merge conflicts API/I18n -> Rails 4.2

tweaks to env and session_store cookie domain

language table, dropdown, additional locales

localization further work, including dropdown initial work

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

Migrated codebase from rails 4.0 to 4.2, also removed most of the version specifications from the gem dependencies and ran bundle update

Updated swagger.rb to use the pre ruby 2.2 syntax '0.0' => {} instead of '0.0': {}

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

Merge remote-tracking branch 'refs/remotes/origin/Update_license'

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.