fixed merge conflicts

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

fixed merge conflicts

fixed merge conflict left over from unstashed changes

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

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

funder guidance now displays on customized templates

Merge branch 'CDL-MVP' into branding

rebranding

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

color changes for rebradning

add custom div to profile page

move user profile to partials, and add prefrences tab

updated link in api mailer

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

Merge branch 'plan-visibility' into CDL-MVP

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

api updates

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

fixed bug in edit profile page

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