rebased with DCC go-live codebase

fixed merge conflicts

css rewrite

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

made docx title correspond to plan title, filename correspond to filename

Merge pull request #445 from DigitalCurationCentre/kmcgre/bugfixes ...

Remove guidances api controller and show action from guidance_groups …

Remove guidances api controller and show action from guidance_groups api controller

added initial edit plan redesign and refactored css so that the files aren't loading multiple times

fixed merge conflicts

Added public DMPs page

remove byebug

fix the nil error for notification preferences

fixed merge conflicts

fixed merge conflicts

fixed merge conflict left over from unstashed changes

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

funder guidance now displays on customized templates

Merge branch 'CDL-MVP' into branding

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

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

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

api updates

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

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

Add Notification Preferences to User's profile page

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