Merged DMPRoadmap V2.1.6

Fixed some tests & added some for research outputs

modified the plan.readable_by? method and added wider test coverage (#2416)

Updated deep_copy on PLan model to set feedback_requested to false

fix issues with plan spec (#2142)

fix error with test refactor

remove unneeded comments, remove further references to reviewer role from tests, dry up refactored tests

updated tests

updated organisational plans query to only include completed plans to match logic of plan export (#2004) ...

refactored plan.visibility_allowed? to call underlying method on phases

refactored plan.visibility_allowed? to call underlying method on phases

fixed tests

finished up changes to controllers

updated Role, Plan logic and fixed tests

refactor plan/role functionality to use flagshihtzu properly

Repair broken or pending specs (#1874) ...

- Fix pending Template model specs

- Fix pending model specs

- Fix broken/pending specs, including random "errors" bug

Refactor how section ordering is handled (#1837) ...

* Extract template customizations into own controller

* Refactor Template model methods

* Fix view logic in draggable sections

* Add button for customising phase

* Fix rubocop violations in GuidanceService

* Rename GuidanceService to GuidancePresenter

* Fix bug in phase preview order sections

* Refactor preview action/controller code

* Fix Section ordering in various views

* Fix rubocop violations

* Fix bug forcing Phases to be modifiable

* Fix broken tests

* Update method to check if section is draggable

* Extract copy action into its own resource

* Extract customization transfers to own controller

* Remove redundant routing condition

* Fix Rubocop violation issues

* Change condition for section draggable

* Refactor instance variable in PlansController

* Fix broken tests

* Add test support for 'de' locale

* Fix merge issue in plans controller

* Fix broken specs in plan#request_feedback

Configurable plan access (#1828) ...

* added configuration options to branding.yml for plan access, updated links to be dependant on access

* updated spec to expect multiple calls to branding

Replace deprecated methods with their new alaises

Fixed broken Plan specs after model

Add specs for all models

Add extra validations for all models ...

- Includes specs using the Shoulda gem
- Includes a refactoring of update_numbers to a "sortable" abstraction

Adding fixtures