add rest timeout
modify room list
Merge remote-tracking branch 'github/master'
modify timeout