Update client.zh_CN.yml
Check for custom avatars by default now.
removes unused context binding from Discourse.Lightbox
Merge pull request #1521 from velesin/lightbox_context_refactoring

removes unused context binding from Discourse.Lightbox
removes unused context binding from Discourse.SyntaxHighlighting
no need for a computed property
add rss links to anonymous homepages
Merge pull request #1522 from velesin/syntax_highlighting_context_refactoring

removes unused context binding from Discourse.SyntaxHighlighting
ooops. régis can't refactor...
Merge pull request #1520 from ofgeek/patch-1

Update client.zh_CN.yml
Add sockpuppet spammer detection. Automatically flag posts if they are from new users (registered less than 24 hours ago) at the same IP address and one of them started the topic.
Version bump to v0.9.7
Upgraded and refactored Sanitizing. Much less crap should get through now!

Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
Reverting the Sanitizer commit in case we have to do something urgent
before we deploy it early next week. It's in the branch `sanitizer` for
now.

This reverts commit 9e93d8ed5209c5c65dfa00fa9b9d17cc8de13244.
Allow `:p` to show a tongue as well as `:P`
FIX: avatar was attached to the user who uploaded it...
add image authorization on upload_avatar
add custom clean env
filter params correctly from error log
security fix, anon should not be treated as though they can create anything