Finalized view for 360-rooms
Merge branch '360-room'