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

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