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

sections belong to phases, not versions

updated phase so that it dosent delete a template when destroyed

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

hacked templates landing page to work

updated orgs_controller, views, and model

updated roles_controller and model functions

began updating roles

re-wrote data access for guidance_groups controller

updated prefetching for guidances index

updated guidances controller and views to reflect new schema

made changes to allow guidance to display

updated user model to allow signin_signout to detect permissions(admin/orgadmin)

final tweks to ensure all migrations happen together

replaced plan roles with bitflags

removed organisation_types and replaced with bitflags

updates so that a user can log into the site \n updated application_controller, user model, registrations edit view, and layouts branding

removed version and updated users_roles to users_perms

made necissary changes to allow the app to display the splash/login screen

replaces Organisation. with Org. in all files

updated theme and user models's associations

updated models for role, section, and suggested answer

updated question_format and roles models

updated relations in question model

changed has_one to belongs_to in new_plans -> templates relationship