fix merge conflicts

saving password details separately

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

only published guidance groups display for plan details

removed auto-publishing of groups by publishing guidance

allows guidances to save attributes other than text

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

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

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

fixed question update logic, addresses #460

fix merge conflicts

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

rebased with DCC go-live codebase

fixed merge conflicts

css rewrite

move the user profile tabs into separate forms

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