merge postgresql -> master

updated application controller so that a user is redirected to the main landing page when then try to access a secure page when not logged in. Added the corresponding locale messages that will be displayed when this happens

updated passwords controller to redirect user to the main landing page after initiating a password reset. Removed reference to invalid spinner css from main layout file

updated gitignore to include initializers that should be server specfic. removed reference to missing spinner.css

translation no longer breaks on header link to create plan

fixed display bug on plan creation confirmation pop up

updated user permissions conversion to migrate org_admin details properly

made omniauth callback handler build dynamically based on db entries

removed user_org_roles from active admin

updated user organisation in active-admin

updated nil/empty check in orcid callback

tweaked user_identifier record creation

changed render to redirect for post oauth

fixed syntax error in orcid omniauth callback

updated omniauth callback handler for orcid

ignored wicked_pdf.rb initializer because it will likely need to be server specific. Updated from_omniauth method on User

Added user_identifiers back to the User.rb object and added comments to new function

resolving merge conflicts during rebase

resolving merge conflicts

setup dynamic omniauth provider structures and tied it into devise

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