fixed various 500 errors in admin, add action, water page
Merge branch 'bug-fix-130430' Fixes some of the issues with Predicates and submitting actions.
Merged Yongwen's and Cam's fixes.
Fixed pylint issue.
Added unlock_condition to new Level form in Designer.
Merge branch 'develop'. Added unlock condition to New Level dialog in Designer.
Cleaning up copy_fields.
Almost done with Education Game.
Don't know why I had to disable W0201, but it caused errors w/o changing the file.
Cleaned up the look and feel for the Education Game.
Merge branch 'education_game' into develop