Minor changes to the shoutbox
Fixed merge conflict in chatter.js