fixes post merge

merge in changes from origin

first port of plan creation and editing to new data model

port of plan creation and editing to new data model

removed region_group (and underlying table) and replaced with has_and_belongs_to_many relationship on Region so that we can do region.super_region and region.sub_regions. Added unit tests for Region

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

added unit tests for question. removed unused methods from question. fixed guidance_for_question method so that it does not require us to pass in itself (was qustion.guidance_by_question(question, org) - now question.guidance_for_org(org)) and updated template that calls method accordingly

minor tweak to templates_history page

added templates history page

fixed bug with permissions constants

initial uni tests for question

added initial unit test for plans. will hold off on finishing

fixed unit tests for phases

Added perm unit tests

uncommented out the email validator. added org unit tests.

finished up unit tests for question_option

Added a managing org and funder scope to Org. Updated methods on Guidance and guidanceTest to work with new schema. Added guidance and guidance_group tests

fixed references to organisation in guidance_group methods. finished guidance_group unit tests

removed Fileupload object since its not referenced anymore. removed all of the empty test/unit/helpers files

finished up answer and note unit tests

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

unit tests for notes and answers. addded new validator to check whether the question's template matches the plans template

Merge branch 'final_schema' into final_schema

create template action now produces a properly-filled in template

bugfixed display logic for editing phase, modifiability of questions, mass-assignment of questions

updated admin_previewphase action in templates controller

removed edit_version view from templates

formatting and style changes

updated some of the plan.rb model to deal with outdated calls to dmptemplate. fixed up answer unit tests and added some validations to Answer

Moved orcid_id from users table to user_identifiers. Added option_based flag to question_formats. switched Object.const_defined to table_exists checks in db migrations because rails loads references to classes on demand so the objects are likely not defined when the migrations run. safer to check for the underlying table's existence