added object locator
changed scene
Merge branch 'master' of github.com:mfueller/RobotManipulation_WS2013