updated user permissions conversion to migrate org_admin details properly

removed user_org_roles from active admin

updated user organisation in active-admin

removed comparison from boolean value to an integer in organisation model

modifying relationship between users and organisations \n -users now belong_to organisation \n -organisations now have_many users \n -removed the depricated user_org_roles structure with migration \n -moved data out of that structure into the existing organisation_id field of users to complete relationship \n -re-evaluated functions to do with organisation_id field, as it was used as a placeholder before

factor out question guidance to reduce sql queries

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

removed data access from view of token_permission_types

Update users page logic so that current user cannot edit their own permissions

Merge branch 'master' of https://github.com/CDLUC3/roadmap

Fixes to the users page

Added tooltip for 'published' checkbox on guidance page. Added confirmation alert when clicking delete on guidance and guidance groups. Removed invalid policy check for organisation id match when creating new guidance

fixed issue with missing organisation_id for current user

fixed broken link between organisations and users

updated the update_user_permissions function to make it more performant

added nil check to user model's keep token method

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

removed trailing ] from plans_controller

removed tooltip for now defunct description field from the organisation page

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

Updated 'destroy' label on view plans page to read 'delete'

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

fixed issue with plan list column display issue

fixed issue with branding variable resolution on plan modal dialogs

Fixed typos: changed all change_org_detials to change_org_details

removed all instances of comparing booleans to 1 or 0 for postgres compatability

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

added errors to organisation controller flash notice