Fix typo in sensor API ruby example and update xml
resolve merge conflicts