Merged conflicts

merge

localization based on url

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

fixed issue with lock/unlock using .json extension in ajax call. fixed unknown i18n references in plans.js

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

added rails 4 bin

added rails 4 bin

Added the new rails 4.2 byebug gem

Removed some debug statements

Fixed issues with settings hash

Fixes to the plan settings page

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

Moved i18n calls out of string content in toolbar.js

Added 'self' prefix to dmptemplate references in models/project.rb because of a scoping issue. tweaks to select2 dropdowns on create project page

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

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

Removed deprecated uniq_by call on ActiveRecord collection

Fixed i18n calls in erb files that were missing an equal sign (e.g. <% t('value'') %> --> <%= t('value') %> so that the value will appear to the user. Also updated i18n calls from admin.js with 'js.' prefix)

Fixed add/remove option js

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