Merge pull request #468 from code-dot-org/finished

deploy to delivered
Merge pull request #475 from code-dot-org/finished

deploy to delivered
Merge pull request #476 from code-dot-org/finished

deliver
Merge pull request #478 from code-dot-org/finished

Finished to Delievered
Merge pull request #480 from code-dot-org/finished

Finished to Delievered
Merge pull request #482 from code-dot-org/finished

Finished to Delievered
Merge pull request #486 from code-dot-org/finished

deploy to delivered
Merge pull request #489 from code-dot-org/finished

deploy to delivered
Merge pull request #492 from code-dot-org/finished

deploy to delivered
Merge pull request #493 from code-dot-org/finished

deploy to delivered
Merge pull request #496 from code-dot-org/finished

deploy to delivered
Merge pull request #499 from code-dot-org/finished

deploy to delivered
Merge pull request #515 from code-dot-org/finished

deploy to delivered
Merge pull request #522 from code-dot-org/finished

dtt
Merge pull request #526 from code-dot-org/finished

deploy to delivered
Merge pull request #534 from code-dot-org/finished

deploy to delivered
Merge pull request #543 from code-dot-org/finished

Deploy to delivered
Merge pull request #554 from code-dot-org/localization

deploy localization changes to delivered
cherry pick of will's localization fix
cherry picked more tests than i wanted.  restrict to just will's change