Fixed duplicate table issue in edit organisation details page cause by an old merge conflict resolution

fixed organisation policy file to use user.organisation instead or user.organisation_id and fixed typos

Updated association between User and Organisation to reflect the removed user_org_roles table. Each User now belongs_to an Organisation.

Updated css so that admin/profile popup menu links fit regardless of language selection. Updated profile save so that if user changed the language selection it updates the current user's locale

Moved language load from registrations/edit page into the controller. Updated registrations/edit page code to directly create the <select> box rather than using rails helpers which for some reason would not actually select the current language value

Updated controller so that user is kept on the edit profile page after saving their changes

added json response back to the settings/projects controller. This just returns the list of selected and available columns for the user's preferences

fixed position and look of organisation dropdown in Sign Up form

increased width of nav bar so that 'change language' and german/french versions stop wrapping

Fixed bug in yaml files. Updated help page content so that it lists an MIT license

updated links and email addresses on the static forms

Added fix for issues when displaying column headings on the view plans page. Setup and 'Unknown' column heading that defaults to ' - ' but is updateable in the locale files. If there are issues determining the column heading it will use that value

fixed issue where orgs cannot customise other org's(funders) templates. logic for this auth limiting dosent make me happy as it potentially allows organisations to submit edited json via post and change the other organisations existing sections, even if that option is not available through the ui

fixed bug where projects_controller wouldnt compile. there was an end in the middle of the file, terminiateing the class prematurely

allow display of html in question

merged local into remote

added authorization to settings/plans and settings/projects

removed json responces from settings/plans and settings/projects controllers

removed unused controllers: User_org_roles, user_org_types, user_statuses, user_types

added auth and removed json from project_groups controller. additionally added constraint to projects and plans controllers that all actions must be authenticated through pundit

added auth and removed json from project_groups controller. additionally added constraint to projects and plans controllers that all actions must be authenticated through pundit

removed unused json responses and added auth to plans controller

removed json and added authorization to projects controller

moved authorization logic from comments controller to policy file. Additionally removed unused crud methods

moved logic for authorization out of answers controller into the policy

removed json and added authorization to answers_controller

removed themes_controller as it was never used

removed json and forced authorization for dmptemplates

removed json and forced authentication on guidance_groups

removed all json responces from guidances controller and forced authorization