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

commented out unecessary org_token_permission model. We use a has_and_belongs_to_many relationship which defines the join table directly

updated logic around customizations display

customizations generate new templates or template versions

fixed minor typo in deep_copy for question

some cleanup of irrelevant objects (e.g. removal of remaining OrganisationType)

commented out organisation getter/setter in user. switched calls to org

removed references to organisation_id in several models and replaced with .org.id

added some missing unit tests. fixed typo on Template.has_customisations? method

renamed projects_helper to plans_helper. moved template.settings tests to settings:template_test

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

Updated projects_helper by renaming 'project_list_column_body' to 'plan_list_column_body'. updated references to that code block. moved hard-coded 'Unknown' to locale files. Added tests for projects_helper

initial customization functionality

fixed bug where sections not editable, questions not saveable

fixed minor typo in admin_phase view

first step in reducing page edit sql queries

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

move plan list settings from project to plan

added answers_controller tests

added a few attributes to Plan and User attr_accessible sections

fixed issue with routes test

updated generic deep copy test to check for uniqueness of excluded attributes (e.g. id, slug, dates, etc.). Fixed typo in Question.deep_copy. Added calls to deep_copy test for template, phase and section

removed old references to the Amoeba gem which was used to clone models. Fixed typo in Question.deep_copy. Added generic test for deep_copy methods.

removed old amoeba gem that was used for cloning active record models. We will use xsrust's new deep_copy methods now

init commit of deep_copy for templates [untested]

fixed bugs introduced into templates by merge

fixed a few merge conflicts

added theme unit tests and started cleanup of remaining existing tests

added suggested_answer unit tests and started on template unit tests

added check to role that sets access by default. added unit tests for section