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

Updated routes.rb to remove unecessary create and edit route definitions

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

Commented out api test since it is incomplete and references a missing fixture. Also commented out stubbed performance test because that functionality is no longer a part of rails

Migrated codebase from rails 4.0 to 4.2, also removed most of the version specifications from the gem dependencies and ran bundle update

setup travis with mysql

Ran a rake db:migration:reset to get the API db changes in

Updated swagger.rb to use the pre ruby 2.2 syntax '0.0' => {} instead of '0.0': {}

Updated database.example.yml

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

Updated seeds.rb to first check to see if record exists before inserting. Added a 4.0 hack to load the new config/secrets.yml file instead of config/initializers/secret_token.rb, this new secrets.yml will auto-load when we are on 4.1

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.