Update client.zh_CN.yml
Merge pull request #1675 from ofgeek/patch-1

Update client.zh_CN.yml
autoload server/client locales in plugins
fix build
Renamed components so they don't all have the annoying discourse- prefix
Hide some values from the topic map if they're 0
Sorting by activity now sorts on `created_at` rather than `bumped_at`
Only show external link icons, use the wikipedia-style icon.
Oops, missing translation
add session to auth hash in oauth complete method
Merge pull request #1672 from shivpkumar/shiv/add-session-to-after-create-account

Add 'session' to auth hash in OAuth complete method
FIX: Invalid sub category links in suggested topics
Merge pull request #1673 from aperrault/patch-04

Fixing neglect to determine whether a user has the permission to create ...
Revert "Merge pull request #1673 from aperrault/patch-04"

This reverts commit c9ea89bdd3bf3d92264cdbd7b0b971237ce34a72, reversing
changes made to 9ed49888fc6dcd2a60d8b8ef73f3508c64206dcd.
Signup form: prefill username if Discourse Hub has a match for the email address. Also, fix some bad specs in username_checker_service_spec that were passing...
FIX: Markdown bug
Say All instead of All Results
Say something when no site settings match the filter
Ah, oops, I forgot a line in TopicList when resolving the merge conflict. ):
Merge remote-tracking branch 'upstream/master'