Merge stale content editor branch#447

Noah Clarke (noahwc) wants to merge 3 commits intomastersaasquatch/program-tools:masterfrom

content-editorsaasquatch/program-tools:content-editorCopy head branch name to clipboard