resolved cherry-pick conflicts

Text changes for #345.

Fixes for #311, #345.

removed old shib handler from edit profile page

updated forms on create/edit plans, contact_us, profile pages to match consolidated css

converted all <form><table> and <form><ol> to <fieldset> on non-org-admin pages DMPRoadmap/roadmap#125

fixed merge conflicts

updated new css and swapped out use of table with fieldset on plan details edit DMPRoadmap/roadmap#125

Merge local branch into feature/sso - fixes #39, #276, #287, #290. ...

Unified omniauth cases & updated tests.
Deleted Project Controller & tests (no longer needed).
Please db:migrate after this commit.

fixed layout of edit profile page DMPRoadmap/roadmap#230 DMPRoadmap/roadmap#125 DMPRoadmap/roadmap#293

Get rid of custom Shib code & revert to generic Omniauth for everything. Modify identifier_schemes table to add scheme specific urls.

hide language dropdown on profile page if there is only one language available DMPRoadmap/roadmap#237

I18n replaced from controllers. DMPRoadmap/roadmap#98

URLs without locale param

resolved merge conflicts

pulled data access out of devise/registrations/edit

code style/revisions for devise registrations edit view

updates so that a user can log into the site \n updated application_controller, user model, registrations edit view, and layouts branding

replaces Organisation. with Org. in all files

added a initialization helper to assist with omniauth provider registration. Added a remove.png image for disconnecting providers from user accounts

Had to remove code that was building devise omniauth connections dynamically. The timing of when the rails engine builds the routes and the models is not conducive to this approach

added in locale entries for identifier schemes

Updated routes to check for the existence of the new identifier_schemes table because rake db:migrate initializes the Rails app and devise tries to make use of the new table

added additional locale message for identifier schemes and a remove icon

resolving merge conflicts during rebase

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

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

removed all instances of comparing booleans to 1 or 0 for postgres compatability

Moved language load from registrations/edit page into the controller. Updated registrations/edit page code to directly create the <select> box rather than using rails helpers which for some reason would not actually select the current language value