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

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

Added localization files for the contact-us gem

Organized locale files for dependencies into subdirectories

Added some bug fixes that were a part of an old 'upgrade-bootstrap' branch but were missed when creating the rails-4-2 pull request. Also replaces the static page urls with localized versions

Updated static page links so that they use localized paths. Added new locized_routes flag to the contact-us initializer and upgraded its gem

Fixed merge conflicts API/I18n -> Rails 4.2

Merged conflicts

merge

localization based on url

Fixed issue with location of web-console in the Gemfile.

updated routes for lock/unlock section on plan form

Updated routes to make lock/unlock paths use json by default

tweaks to env and session_store cookie domain

final commit before merging into master

Updated textbox and textarea sizes on contact_us form. added a route for the 'future plans' page

language table, dropdown, additional locales

added code for sending email to users when granted api tokens

added a page for users to view api endpoint information

updated path to api_update to allow admin nav

Removed all accepts_nested_attributes_for for belongs_to associations because they were creating circular calls in ActiveRecord.

added new route to org admin users index

localization further work, including dropdown initial work

added tags to localisation

Updated routes.rb to remove unecessary create and edit route definitions

adding standardised errors to locales

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

Commented out api test since it is incomplete and references a missing fixture. Also commented out stubbed performance test because that functionality is no longer a part of rails

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