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)

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

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

fixed question update logic, addresses #460

fixed issure with public plans table filter

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

made toolbar a generic table filter. finished css restyling of users page

finished css rework on org edit

had to move jquery timeago back to root, added js for org edit page. fixed styling of header when org logo and banner are present

cleaned up references to js files in views

rebased with DCC go-live codebase

fixed merge conflicts

using data-toggle attribute to initiliase and trigger any popover. DMPRoadmap/roadmap#431

css tweaks to guidance pages

css rewrite

move the user profile tabs into separate forms