Merge pull request #717 from jnarron/havoc

Added emoticon support for statuses