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

updated users controller

renamed comments to notes

updated a view for settings controller

removed organisation_users controller as duplicate from users controller

updated some of the answers structure, commented for future updates

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

replaces Organisation. with Org. in all files

removed option_warnings table and unused code surrounding the structure

text changes requested by Sarah 2016/11/14

if no title for news tab miss it out

Merge branch 'master' into postgresql

removed commented out code from new branding changes

renamed layout partials to remove reference to dmponline. Updated configurations so that the code default assets are stored in lib/assets and any instance specific versions would be stored within app/assets. Move static page content out of the large locales files and placed examples of them into config/locales/static_pages

removed <p> wrapping from default answers in preview

allowed default answers to show in admin preview of templates

Corrected spelling of text_desription field in token_permission_types

fixed issue with settings data saved to the DB using an old version of the gem. stripped html tags from question text for display in the export form.

attempting to silence the activerecord log during tests.

merge postgresql -> master