Merge into delivered
Merge branch 'finished' into delivered
Merge pull request #572 from code-dot-org/finished

fix test
Merge pull request #573 from code-dot-org/finished

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

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

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

Deploy to Delivered
Merge pull request #590 from code-dot-org/finished

Deliver changes.
Merge branch 'finished' into delivered
Merge pull request #593 from code-dot-org/finished

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

Deploy to delivered
begin work on dsl refactoring
move test i18n load into test_helper.
(initializer breaks when using Spring, explicit I18n.backend.reload! works just as well)
remove TAKE_TEST env variable
Automatically built.
Merge pull request #602 from code-dot-org/finished

Deploy changes.
Match and multi strings should use the default English if we don't yet have a loc'ed string available.
Merge branch 'finished' of github.com:code-dot-org/dashboard into finished
Merge pull request #603 from code-dot-org/i18n_test

move test i18n load into test_helper
Merge pull request #604 from code-dot-org/finished

deploy to delivered