Updated Sensor Model class, room controller, and the roomEvent class
Merge remote-tracking branch 'origin/master'