scene edit
Revert "scene edit"

This reverts commit efc205bfb3e1b0c1fd9669b78a3c4a9dc8e66d24.
SceneEdit
Merge remote-tracking branch 'origin/master' into EnemyPatern