placeholders; correct title
Merge commit 'github/testing' into beta
allow old docs
fix label text
only one reset button per menubox
make sorting work in roomslist
Merge commit 'github/testing' into beta