Merge pull request #798 from code-dot-org/staging

DTT
Merge pull request #802 from code-dot-org/staging

DTT
Merge pull request #804 from code-dot-org/staging

DTT
Merge pull request #806 from code-dot-org/test

DTP
hotfix hoc.com strings above map
Merge branch 'test' into staging