improved player movement
improved some things and put pickables in scene
Merge branch 'master' into scene-merge
fixed merge issues
improved LightController -> SwitcherController
added GetItems to IInventory
Merge branch 'master' into scene-merge
Merge branch 'scene-merge'