Merge branch 'hotfix/3.6.1' into develop
undo release testing changes to demo
I put the CSS and IMG files back in their place and stopped the test server from outputting so much useless text on a build.
do not track this dependency
Merge remote-tracking branch 'origin/develop' into feature/810-add-automation-to-testing-process-v2