fixed merge conflicts

fixed merge conflict left over from unstashed changes

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

Xsrust/bugfixes

updated other controller actions shown to throw error by test, we render phases/admin show from other controllers, so need same instance variables defined

drive org-admins to add an abbreviation to their org for display with annotations

funder guidance now displays on customized templates

add custom div to profile page

move user profile to partials, and add prefrences tab

Change default plan visibility to `3` (`:privately_visible`)

updated link in api mailer

fixes error with prefetching, now passes tests

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

completed work on API

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

api updates

css tweak and wording changes DMPRoadmap/roadmap#405

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

fixed bug in edit profile page

updated size of shib_ds page org list columns and updated org links DMPRoadmap/roadmap#405

css tweaks for DMPRoadmap/roadmap#408

Fixed problem when changing question format for editing. Implemented default answer for textfield and textarea. Example answer now loads tinymce for editing too. DMPRoadmap/roadmap#414

updated edit profile page to display api with same formatting as the rest of the page

fixed logic which lead to guidance not being displayed

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 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)