Checkpoint for custom content handler
Checkpoint 2 for custom content
Finalize custom content handlers
Small fixes
Merge master
Merge pull request #2680 from dimagi/custom-content

New custom content handlers