replaced instances of 'let' with 'var' in js files. rails' asset pipeline cannot handle 'let' at this version

Merge branch 'branding' into CDL-MVP

update the schema with user's prefs

tweaks to header section and logo

fixed merge conflicts

Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP

fixed merge conflicts

fixing the tab issue on Edit profile page;add/update notification preferences

Merge branch 'CDL-MVP' into branding

rebranding

Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP

color changes for rebradning

move user profile to partials, and add prefrences tab

completed work on API

Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP

Merge branch 'plan-visibility' into CDL-MVP

added plan visibility to edit/view plan details DMPRoadmap/roadmap#151

css tweak and wording changes DMPRoadmap/roadmap#405

started converting over to the new column layout on view plans page

added 'create test plan' link to view plans page and default setting in application.rb DMPRoadmap/roadmap#83

Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP

css tweaks for DMPRoadmap/roadmap#408

fixed logic which lead to guidance not being displayed

Add Notification Preferences to User's profile page

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

(cherry picked from commit 998f704)

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)