raise ActiveRecord::RecordNotFound (which causes 404) instead of NoMethodError (500) on level urls with invalid stage number
levelbuilder changes (dave)
Merge pull request #683 from code-dot-org/staging

DTLB
Merge pull request #687 from code-dot-org/staging

Deploy levelbuilder
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into levelbuilder
remove SeamlessDatabasePool so we don't set unneccesary session cookies
fix integration test
Merge pull request #688 from code-dot-org/no-unnecessary-session

remove SeamlessDatabasePool so we don't set unneccesary session cookies
Merge pull request #669 from code-dot-org/404-on-invalid-stage

raise ActiveRecord::RecordNotFound (which causes 404) instead of NoMetho...
updated copy to tos
updated more copy on tos
Merge pull request #690 from code-dot-org/updatedtos

updated copy to tos
Dropbox changes
Blocks aren't initialized yet when show() returns
Automatically built.

commit 78bd7a4ec847d9e7e4c85b8caedfae9f3f7acdea
Author: Josh Lory <josh.lory@code.org>
Date:   Fri Dec 5 10:07:16 2014 -0800

    Blocks aren't initialized yet when show() returns
Merge pull request #692 from code-dot-org/staging

Deploy levelbuilder
Always show callouts on the admin /levels/n page
show congrats for special script
Merge pull request #691 from code-dot-org/special

show congrats for special script
Merge pull request #694 from code-dot-org/staging

staging -> levelbuilder