fix merge conflicts

saving password details separately

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

Xsrust/bugfixes

added remove_logo as permitted parameter. DMPRoadmap/roadmap#459

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

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

Xsrust/bugfixes

updated guidance selection to ignore unpublished groups/guidances

updated translations from plan_details page

only published guidance groups display for plan details

removed auto-publishing of groups by publishing guidance

allows guidances to save attributes other than text

allows customizer's sections to appear before the template creators

accounting for tests not always having annotations (whereas views do)

Merge pull request #467 from DigitalCurationCentre/issue456 ...

Redirect to the referer URL when changing language

Redirect to the referer URL when changing language. DMPRoadmap/roadmap#456

added spaces between questions, better mimics pdf format

added new roadmap logo. started applying new css to plan edit page

move Orcid styling to roadmap-form css file

updated shibboleth-ds page so that column layouts are same size

adds disk option for bullet display

fixed question update logic, addresses #460

added bullet point options to tinymce editor. circle and square export correctly. Addresses #464

fixed issure with public plans table filter

readded Dmproadmap.js as dmproadmap.js

removed Dmproadmap.js so that we can readd as dmproadmap.js ... git appears to ignore case but rails does not

fixed name of common Dmproadmap.js in application.rb

started switching template/phase/section pages over to new css

fix merge conflicts

include the additional preferences on user profile

added old admin.js back in to handle templates page. finsihed css rebuild of guidances and guidance groups