resolving merge conflicts

Merge pull request #52 from DigitalCurationCentre/master ...

Merging latest bugfixes/ postgres compatibility fixes

Added both DB gems for dev/merging compatibility

setup dynamic omniauth provider structures and tied it into devise

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

Added a new identifier_schemes table and corresponding user_identifiers join table. Added the initial ORCID identifier scheme to the seeds.db file. Updated the locales file to include corresponding identifier tooltip language, logos, and initial connection message. Updated user profile page to dynamically display identifiers

fixed issue with 'make small changes' selection on template version edit modal

Fixed issues with modal dialog functionality when trying to edit a published template

factor out question guidance to reduce sql queries

Added tinymce configuration line to the template/phase edit page

fixed authorization variable issue in dmptemplates_controller#admin_cloneversion

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

Fixed issue with plan creation not properly saving guidance selections. Fixed contact us page typos

Fixed JS issues with select2 boxes not properly updating contents when 'not applicable' clicked and not updating the funder/institution on the confirm dialog

Added wkhtmltopdf binaries to gemfile. Moved wicked_pdf config to an initializer so that it can be custom to the server instance. Updated dead link to DMP Checklist pdf

removed data access from view of token_permission_types

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

removed devise.rb initializer. this should be specific to the server running the application

fixed broken link on terms page

Add logo files via upload

reverted changes to devise that were attempting to redirect users to the login page after session expiration. It was causing occassional sign_in issues due to a redirect loop

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