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

Merge branch 'final_schema' into final_schema

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

resolved merge conflicts

merged final_schema changes into visibility

fixed merge conflicts

fixed merge conflicts in branding.yml and schema.rb

updated api templates endpoints to use new data access

updated additional parts of the admin_phase view to use the new schema's data access. Additionally changed models for suggested_answer, user, guidance_group and question to better reflect the associations in the schema

added in new files for public plans page. added code coverage to .gitignore

extracted plan visibility work out of dev branch for PR to DCC

updated admin_phase view and partials associated with it to use new data access

removed substance-forms modifications from the dev branch. will place in a separate branch so that we can continue development

updated admin_addphase in templates controller

updated admin_destroy for templates

updated admin_new to reflect new schema, converted tabs to spaces

templates admin_update working

updated admin_template action and views, also removed spaces from affected files

patch so that templates_controller index displays

fixed merge conflict in seeds.rb file. installed substance-rails gem and updated code to swap in the substance-forms text-area for tinymce on the answer section of the edit plans page

Switched answer text area to substance editor.

switched visibility over to an enum. updated the project objects accordingly. Added some more unit tests. Updated locale files with visibility text

hacked templates landing page to work

renamed dmptemplates to templates