Merge branch 'master' of https://github.com/DMPRoadmap/roadmap into postgresql

removed data access from view of token_permission_types

Fixes to the users page

Merge branch 'postgresql' of https://github.com/DigitalCurationCentre/roadmap into postgresql

removed trailing ] from plans_controller

replaced invalid SQL conditionals "&&" with "AND"

fixed issue with policy check when saving changes to a plans export settings

Updated export page so that the settings section of each phase's accorordion panel is not an accordion. Its now just a div.

updated actionmailer to use the hostname when adding urls to emails. Also fixed bug in [object]_path route helpers contained within an ActionMailer view. ActionMailer was not proviing the localization portion of the url. Manually including the default locale now in links to the project

removed references to old existinguser controller that was used to handle logins from old DMPOnline v3 accounts

added errors to organisation controller flash notice

fixed bad route reference in organisations controller

Added trap for Dragonfly exceptions on the organisation update. It will now display the logo upload error message stored in the locale files

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

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

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 bug where projects_controller wouldnt compile. there was an end in the middle of the file, terminiateing the class prematurely

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