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

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

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

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

Upgraded select2 js file

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()

Added js preventDefault to modal popup functions to prevent them from appearing and immediately disappering

removed redundant bootstrap file. using bootstrap.min.js going forward. updated css to default align all text to left

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')'

Updated find_by_all to the newer and more accepted 'where'

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

Rebased development branch and corrected merge conflicts

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 better data to seeds file. Tested upgrade to bootstrap 3.2 but reverted back

Added console debug lines to JS and then removed them when done

Fixed bootstrap tab issue on static pages. JQuery selector was not specific enough and was mixing up top nav bar with page specific tabs

Updated user model to assign variables to the attr_accessible list so that User profile and Super Admin user updates work

Updated User model so that the edit profile page will save changes

Added missing fontawesome web font.

Fixed issue with undefined 'options' variable in projects.js