Allow params to /bookmark when in a room
Merge branch 'master' into plugins