Merge pull request #411 from jgen/develop

Chatbox is broken on develop branch
Merge branch 'develop' of git://github.com/shish/shimmie2 into develop