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

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

hacked templates landing page to work

renamed dmptemplates to templates

pulled data access out of devise/registrations/edit

code style/revisions for devise registrations edit view

fixed syntax bug in user_mailer for api_tokens

updated orgs_controller, views, and model

updated roles_controller and model functions

re-wrote data access for guidance_groups controller

updated prefetching for guidances index

updated guidances controller and views to reflect new schema

fixed a display bug in guidances/admin_index

made changes to allow guidance to display

bugfixes to allow org_admin pages to render

changes to _navigation partial to allow org_admin to render correctly

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

updated organisations to orgs, and associated views/controller