Added both DB gems for dev/merging compatibility

moved migrating user permissions to a rake task migrate:permissions

fixed issue where users needed an unconfirmed_email field due to faulty devise setting

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

renamed example files which get loaded by rails and cause configuration problems.

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

Changed to streaming fork of yaml_db gem.

Merge pull request #38 from CDLUC3/master ...

Bug fixes 
Merging various bug fixes
(Closes #34, #37, #36, #35)

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

fixed typo in fr.yml locale file. Added custom failure app for devise that should redirect the user to the home page on a session timeout

fixed typo with class name

Updated devise to redirect user to the home page after session expiration rather than the unauthorized page

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

Fixes to the users page

update ReadMe.md

update ReadMe.md

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

added my customised yaml_db gem to gemfile, adds proper support for streaming documents and allows the load to be run on ram-restricted servers

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

changed schema to be correct for point of migration of data

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