Rename old parameter level_type parameter to level.type (merge test conflict)
Merge pull request #540 from code-dot-org/fix_level_controller_test

Rename old parameter level_type parameter to level.type (merge test conflict)