Merge branch 'public-plans' into CDL-MVP

added check for nil owner

Merge branch 'public-plans' into CDL-MVP

added check for undefined org

fixed merge conflicts

added public DMP export file. its a duplicate of the regular plan PDF export but decided to make a copy instead of reusing in case we want to add watermarks or something

Added public DMPs page

add checkbox label styles

remove byebug

fix the styling of button on edit profile page

fix the nil error for notification preferences

switched remaining 'let' in JS to 'var'

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

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

Merge branch 'branding' into CDL-MVP

switched default prefs setting to before_validation

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

Merge pull request #56 from DMPRoadmap/development ...

Rebase with latest bugfixes

fixed merge conflict left over from unstashed changes

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

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

ran gettext:find for new translations

made gettext calm down about fuzzy translations (no more warnings)

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

funder guidance now displays on customized templates