updated orgs_controller, views, and model

saved roles_controller changes

updated roles_controller and model functions

began updating roles

guidance and guidance groups controller changes

re-wrote data access for guidance_groups controller

updated guidances controller and views to reflect new schema

made changes to allow guidance to display

bugfixes to allow org_admin pages to render

updated name for orgs_controller

updated organisations to orgs, and associated views/controller

renamed organisations_controller to orgs_controller

updated users controller

updated users_controller, mainly renaming roles to perms

updated code style in omniauth_shibboleth_request_controller

renamed comments to notes

code style change in sessions_controller

added comments to home_controller, awaiting discussion

updated contacts_controller

removed organisation_users controller as duplicate from users controller

updated some of the answers structure, commented for future updates

finished update of token_permission_types_controller

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

fixed bug where selecting guidance was impropperly filtering

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 ability to customize view branding folder name. It will just be called branded now