fix friendly URL issue?
Merge branch 'develop' of git://github.com/esotalk/esoTalk into develop
fix issue with post controls on firefox
improve the way sticky excerpts are formatted
allow typing in a value in the colour picker
another fix to control icons on firefox
fix @mention detection
fix attachments button jumping
Merge branch 'master' into develop
attachments delete icon
fix textarea autogrowing in firefox
Merge pull request #126 from esotalk/develop

Develop
fix text area autogrowing in chrome. did I hit the sweet spot yet?
don't ever disable the discard draft button
Merge branch 'master' of https://github.com/esotalk/esoTalk
remove unneeded skin resources
fix XSS vulnerability with conversation title
remove slug generation from PHP - we do this in javascript
fix channel reordering. closes #127
fix fatal error when deleting a channel with no conversations in it