Added a PM buttons for the future 'private discussion' feature
Merge branch 'master' into pm
private messaging opens a private room (new or reused) whose owners are the two ends of the PM
merge
Merge remote-tracking branch 'origin/master'