updated restmachine_resource
Merge branch 'sprint2.stream-handler' of ssh://git@github.com:22/projectcs13/sensor-cloud.git into sprint2.stream-handler