rooms sort and views
Merge remote-tracking branch 'origin/master'