added additional locale message for identifier schemes and a remove icon

Merge branch 'add-orcid-functionality' of https://github.com/CDLUC3/roadmap into add-orcid-functionality

resolved rebase merge conflicts

fixed issue with settings data saved to the DB using an old version of the gem. stripped html tags from question text for display in the export form.

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

made omniauth callback handler build dynamically based on db entries

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

resolving merge conflicts during rebase

resolving merge conflicts

setup dynamic omniauth provider structures and tied it into devise

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 issues with modal dialog functionality when trying to edit a published template

fixed authorization variable issue in dmptemplates_controller#admin_cloneversion

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

removed data access from view of token_permission_types

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

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