Revert "Revert "Merge pull request #776 from code-dot-org/feedback_collect""

This reverts commit cbb038d1fc9cab450b04f8747de1dfe4443b4973.
Revert "Revert "Merge pull request #889 from code-dot-org/feedback_collect""

This reverts commit 9143ed2f3e34aafe16601243b3fc3ad05994cd46.
Merge pull request #970 from code-dot-org/revertTheRevert

Revert the revert