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

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

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

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

DMPonline4 - RAILS 4.0 (#4) ...

Merging the initial DMPOnline4 codebase into Roadmap

DMPonline4, this code was designed and implemented by the Digital
Curation Centre (DCC)
DMPonline runs in Ruby 2.1 and Rails 4.0, there is a mysql database.