Oculus camera and sphere movement
fixed merge conflicts