fixes DMPRoadmap/roadmap#172

Updated travis file to recreate the test DB and then load it from the schema.rb file rather than running db:migrate due to issues with the dmponline upgrade scripts

Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now DMPRoadmap/roadmap#159

Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now

switched registrations controller to user org_id instead of organisation_id. fixes DMPRoadmap/roadmap#145

fixed merge conflicts in schema.rb and test_helper.rb

Merge pull request #33 from DMPRoadmap/development ...

DCC database refactoring

Merge pull request #104 from DigitalCurationCentre/development ...

Data model/schema refactoring

Merge branch 'final_schema' of github.com:DigitalCurationCentre/roadmap into development

Merge branch 'removing_unused_tables' of github.com:DigitalCurationCentre/roadmap into development

trying to fix settings routes and views

sort out post merge issues

fix up post merge errors

resources -> resource

mege in head changes

trying to reduce data access queries. Needs more work

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

fixed bug where guidance_policy was attempting to prefetch question

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

app.pot re-generated

.pot and .po files re-generated

removed organisation_type admin interface as was causing conflicts

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

bugfixing update customized template

customizers can always add sections to a phase

removed slugs unique requirement from phases ** may break other code

updated show/edit for template publishing

added versioning/updating for customizations, and updated display logic for customizations on admin_index page

added customization function for only suggested_answers and annotations

views/shared and views/layours converted to gettext_rails