swapping an icon
noop
Fixing new changes to the upstream, need to add class emoticon to links
testing bb
testing update
Merge branch 'master' of git.moovweb.com:noj/hipchatemo
reverting test
testing push
fixing older commit
Adding morbo
Adding abraham simpson
fixing break from upstream change
adding catbug
emoji
adding lemon emoji