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

added templates history page

Merge branch 'final_schema' into final_schema

create template action now produces a properly-filled in template

updated admin_previewphase action in templates controller

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

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

updated admin_addphase in templates controller

updated admin_destroy for templates

updated admin_create in templates controller

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

updated accessing of own templates to only display most current versions

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 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

Added a few 'TODO:' statements indicating some methods we should remove. (Do a "grep -r 'TODO:' ./app"). Added some template and comments unit tests

renamed dmptemplates to templates