added new seed file that works with new schema. commented out plans and answers for now though because plan model is unfinished

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

cleaned up tests

updated attr_accessible lines to allow mass assignment of associations via object instead of id

finsihed phase unit tests. added all unit tests that i forgot to add in prior commits

added unit test for phases and updated readme with links out to wiki docs

added unit tests for options and option_warnings

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

sections belong to phases, not versions

updated phase so that it dosent delete a template when destroyed

finished guidance_groups test. started on guidance tests

put validation back in place that ensures a question can only have a single answer within a plan

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_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 answer text area to substance editor.