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

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'

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)

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

pointed form to the new controller action

added form to admin nav

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

view now depricated

moved old org-admin users index view to new controller, added logic for updating api privleges

removed deprecated link_to_object function from helpers/application.rb and added client side js script to add new options to a question.

Replaced deprecated link_to_function. the call in the helpers/application.rb should eventually be rethought. We shouldn't be using the onclick function of an html element directly, we should use the jquery approach: .click()

Fixed stack too deep error by commenting out circular reference to sections in the version model. Changed deprecated '.find(:all, :order => 'field ASC')' format to '.all.order('field')'

localization further work, including dropdown initial work

added marta's changes to export.pdf.erb and _edit_question.html.erb

added api priveleges column to org-admin's view of users

show api_token in user's profile view

Updated find_by_all to the newer and more accepted 'where'