Merge pull request #483 from code-dot-org/test

DTP
Merge pull request #485 from code-dot-org/test

DTP
Merge pull request #488 from code-dot-org/test

DTP
Merge pull request #489 from code-dot-org/test

DTP
Merge pull request #494 from code-dot-org/test

DTP
Merge pull request #497 from code-dot-org/test

DTP
Merge pull request #499 from code-dot-org/test

DTP
fix broken image for api/hour/finish tracking pixel
Merge pull request #502 from code-dot-org/staging

DTT
Move event map for email.
Merge branch 'production' of github.com:code-dot-org/code-dot-org into test
Merge branch 'test' of github.com:code-dot-org/code-dot-org into staging