Merge branch 'development' of ../roadmap_src into development

Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development

Merge pull request #413 from DigitalCurationCentre/xsrust/bugfixes ...

fixed logic which lead to guidance not being displayed

fixed logic which lead to guidance not being displayed

removed all occurrences of 'sign up' and replaced with 'create account' DMPRoadmap/roadmap#112

Merge pull request #412 from CDLUC3/remove-sign-up ...

Replace the term 'Sign up' with 'Create account'

Add Notification Preferences to User's profile page

removed all occurrences of 'sign up' and replaced with 'create account' DMPRoadmap/roadmap#112

shibboleth_ds changes to make org list links work DMPRoadmap/roadmap#405

fixed plans_controller_test

fixed double render issue in shibboleth_ds_passthru

bug fix to shibboleth_ds_passthru when page has normal dropdown box

updated threshold on shib discovery service page DMPRoadmap/roadmap#405 ...

(cherry picked from commit 14cb3f2)

fixed typo in shib ds column sizes DMPRoadmap/roadmap#405 ...

(cherry picked from commit 4b4874a)

made shib discovery service disabled by default on application.rb specific installations can override in environments files DMPRoadmap/roadmap#405 ...

(cherry picked from commit b359983)

finsihed up shibboleth custom ds page DMPRoadmap/roadmap#405 ...

(cherry picked from commit 998f704)

tweaks to get shib sso login working when called from shibboleth_ds DMPRoadmap/roadmap#405 ...

(cherry picked from commit 2dc4fad)

added shibboleth Login.sso with entityID passthru action DMPRoadmap/roadmap#405 ...

(cherry picked from commit 314b24e)

updates to shib-ds css and js ...

(cherry picked from commit 3015163)

fixed some minor labeling of create account headers and links. updated login/register js so that they stop throwing js errors ...

(cherry picked from commit e91ed14)

resolved cherry-pick conflicts

added new custom shib ds page ...

(cherry picked from commit 5951ebe)

resolved cherry-pick conflicts

resolved cherry-pick conflicts

resolved cherry-pick conflicts

fix the table column with on share plan table ...

(cherry picked from commit 2a84f1b)

Make duplicated plan page editable ...

(cherry picked from commit a413607)

fixed bug with email validation JS by removing old method ...

(cherry picked from commit 44588ad)

fixed bug on contact_us page ...

(cherry picked from commit e041a9d)

updated contact-us to work with new form css and js ...

(cherry picked from commit fd16459)