Fix name collision
Levelbuilder changes
Merge pull request #824 from code-dot-org/levelbuilder

Levelbuilder changes
Merge pull request #825 from code-dot-org/staging

DTT