Merge pull request DefectDojo#1508 from Maffooch/dedupe

Return dedupe to a "working" state

Merge pull request DefectDojo#1227 from DefectDojo/dev

Merge from Dev

Entrypoint fix for docker (DefectDojo#1041)

* fix#982

* update

* Handle Burp Collaborator issues

This is an enhancement in order to handle findings that contain Burp collaborator interactions which have additional request/response pairs and additional information that was normally ignored or breaking the importing of the report .

* Fix flake8 errors

* More accessibility fixes for top and side menu

* Made search button accessible

* tune uwsgi read timeout (troubleshoots 'upstream timed out' on POST import_scan_results)

* add a different docker-compose for dev and for release

* add a different docker-compose for dev and for release

* Update README.md

* cicd engagement: after delete return to cicd engagement view

* Updated DOCKER.md in dev branch to include info on checking versions for docker and docker-compose. People are getting tripped up by installs that aren't up to date

* Docker readme update

* Travis compose sourcing script

* Github template DB addition, docker sourcing

Merge pull request DefectDojo#1022 from DefectDojo/dev

Minor enhancements

Merge pull request DefectDojo#972 from DefectDojo/dev

Container fix, helm secrets and memory optimizations

Merge pull request DefectDojo#958 from DefectDojo/dev

1.5.4rc1

Merge pull request DefectDojo#856 from devGregA/master

Fixes permission issue

Update settings.dist.py

Create admin.py

Update stale.yml