Merge branch 'master' into heroku_mods
Add tooltip to avatars of people who liked a post
Update category's topic_count immediately when trashing or recovering a topic; this ensures that a category can be deleted without waiting for the category_stats job to run.
upgrade font awesome to version 3.2.1, use scss instead of css for the include.
added EMBED_CLOCKWORK so users can embed clockwork scheduling inside another process
Merge branch 'heroku_mods' of github.com:ethank/discourse into heroku_mods
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into heroku_mods