updated plan edit save so that it doesn't throw an error about visibility

remove prefs from registrations controller, as its refered in users

fixed merge conflict

fixed issues with plan edit/share/export and updated to work with new css. tweaks to layout of create plan

fix update_password form

switched guidance update to return to edit page instead of show

fixed merge conflicts

Fixed test broken by new CSS changes and the removal of a few unessecarry show (e.g. org, guidance, etc.) pages

Merge pull request #469 from DigitalCurationCentre/issue459 ...

added remove_logo as permitted parameter.

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