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

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

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

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

changed Org.organisation_type to Org.type to fix conflict in running migration

hacked templates landing page to work

added unit test for exported_plan. added validations to exported_plan and has_many side of relationship to user and plan

removed tests for methods that should be purged from templates model (See issue #89)

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

added validations and associations for Comment model. Also added unit test

added validations to the Answer model and added unit test

switched visibility to be a bit flag using FlagShihTzu instead of a lookup table. adjusted db migration. Removed all of the empty stub test files generated by the rails scaffolding mechanism.

updated orgs_controller, views, and model

updated roles_controller and model functions

began updating roles

re-wrote data access for guidance_groups controller