resolved rebase merge conflicts

Updated locale files with proper labels for the plan export screen

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

setup dynamic omniauth provider structures and tied it into devise

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 plan creation not properly saving guidance selections. Fixed contact us page typos

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

fixed broken link on terms page

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 typo in invalid web address notification

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

Changed 'plan title' to 'file name' in export settings to more accurately reflect what the information will be used for.

Added trap for Dragonfly exceptions on the organisation update. It will now display the logo upload error message stored in the locale files

fixed policy name typo in locale files

updated 'i accept the terms and conditions' link on sign up form so that the terms open in a separate window

Fixed bug in yaml files. Updated help page content so that it lists an MIT license

updated links and email addresses on the static forms

Changed Digital Curation 'Center' to 'Centre' in all locale files

Added fix for issues when displaying column headings on the view plans page. Setup and 'Unknown' column heading that defaults to ' - ' but is updateable in the locale files. If there are issues determining the column heading it will use that value

reverted back changes to user<-->org relationship. added missing api and magic strings sections to the other locale files.

Branding changes (#24) ...

- Removed the description field from organisation
- Added a contact email field to organization
- Added an email address validator
- Updated organisation logo upload so that the system will resize the image to the correct height rather than forcing the user to provide a 100x100 image
- Change how the organisation logo is displayed 

* updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size.

* removed height and width constraints to logo upload function. Added method that will resize the uploaded logo so that the width is 160px (maintaining aspect ratio) so that the logo fits within the layout properly

* changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications

* Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.

Fixed issue with link to the terms page in the 'I accept the terms and conditions' link in the sign up section. The link is a part of the locale file, so created a variable called current_locale

Created DMPRoadmap logo and swapped out JISC logo for UC3 logo.

Began removing branding variables from the locales file and placed them in branding.yml

updated en-UK and en-US locale files to make sure that they use their respective locale ids instead of en. Added a branding yaml file for org and app names

Organized locale files for dependencies into subdirectories