Add changes from levelbuilder server
Merge pull request #1159 from code-dot-org/levelbuilder_changes

Add changes from levelbuilder server