force locale for chapter partner sites
More consistent formatting on hoc signup form
freeplay for calc
handle exceptions inside interpreter.step
Merge pull request #320 from code-dot-org/editcode_step_error

handle exceptions inside interpreter.step
Improvement to button placement on mobile.
we should probably be to_s'ing things the user passes us before trying to redirect to them
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Automatically built.

commit 91c210c54e685aca085b404f3ab237f9d7ad10c0
Merge: 9dd68b6 e38a5fe
Author: cpirich <chris@code.org>
Date:   Mon Nov 3 15:45:12 2014 -0800

    Merge pull request #320 from code-dot-org/editcode_step_error

    handle exceptions inside interpreter.step

commit e38a5fe38caebd2d38a939227e92d6efd89778ce
Author: cpirich <chris@code.org>
Date:   Mon Nov 3 15:34:01 2014 -0800

    handle exceptions inside interpreter.step
do not serialize level_source_id
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Merge pull request #318 from code-dot-org/calcFreePlay

freeplay for calc
Merge pull request #321 from code-dot-org/hoc-signup-form-formatting

More consistent formatting on hoc signup form
Automatically built.

commit 91b3c6ca62ed8b512a9c3e85b5917465c5181a5d
Merge: 136e0c1 43b2f9e
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Mon Nov 3 16:17:40 2014 -0800

    Merge pull request #318 from code-dot-org/calcFreePlay

    freeplay for calc

commit 136e0c18f796bc046fa5755596c9ee97574273dc
Merge: 09cb53e 7b495f3
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Mon Nov 3 16:12:26 2014 -0800

    Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Better button placement by reading window size (left aligned on mobile).
Merge pull request #323 from code-dot-org/hoc-button-fix

Hoc button fix
prizes merge conflict
prizes merge conflict
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
move activity pdfs to csteacher folder