Merge pull request #348 from code-dot-org/staging

Ampersand to question mark fix for image cache bust fix
Merge pull request #349 from code-dot-org/test

pickup changes from test
do not raise RuntimeError 'unauthorized' in ReportsController (use CanCan instead)

Conflicts:
	test/fixtures/scripts.yml
also get rid of the runtimerrors for LevelsController
Automatically upgraded blockly-dist.
Merge pull request #352 from code-dot-org/do-not-raise-RuntimeError-unauthorized-again-again

Do not raise runtime error unauthorized again again
Automatically upgraded blockly-dist.
[Finishes 67708154]: disable student prizes
Automatically upgraded blockly-dist.
Merge pull request #353 from code-dot-org/pivotal_67708154

Pivotal 67708154
Automatically upgraded blockly-dist.
wrap seed tasks in transactions so minimize database inconsistency during deploys
Merge pull request #354 from code-dot-org/wrap-seed-tasks-in-transactions

wrap seed tasks in transactions
Resolve merge conflict