Merge pull request #410 from code-dot-org/delivered

Delivered to Master
Merge pull request #415 from code-dot-org/delivered

Delivered to Master
Merge pull request #420 from code-dot-org/delivered

deploy to production
Merge pull request #429 from code-dot-org/delivered

Deploy to master from delivered
Revert "merge branch gallery to finished"

This reverts commit 8ca8075541fff9c17dfe724cfb718649d05e038a, reversing
changes made to 220f0e72813b12ae2f4f886a5b7e0ecbbb9bfa02.
Merge pull request #432 from code-dot-org/revert_pr_426

Revert pr 426
Merge pull request #433 from code-dot-org/finished

undo save to gallery changes that locked up the prod db