added forgotten view for org-admins giving user's api permissions

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 old unnecissary data structures from fixtures

added data structures for testing

added data structures for testing

fixed auth to reject empty string

began implimenting testing for projects controller

added gem to allow testing of controllers

renamed token_permission_type to plural to follow convention of fixtures

added data structures for testing

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