Update client.zh_CN.yml
Update client.zh_CN.yml
Extracted featured_users functionality out of Topic.

* Created a TopicFeatureUsers model
* Topic#featured_user_ids and Topic#feature_topic_users now delegate to
* a TopicFeatureUsers instance to keep demeter happy.
Merge pull request #1388 from ofgeek/patch-2

Update client.zh_CN.yml
Merge pull request #1389 from einarj/extract_featured_users

Extracted featured_users functionality out of Topic.
FIX: Navigating to a new topic after editing one was leaving edit controls open.
FIX: BAD CSRF on login. Don't check csrf in the fake login form since it doesn't actually do anything.
FIX: Allow intra-word underscores.
FIX: avatar thumbnail won't save after upload
Merge pull request #1391 from ZogStriP/fix-avatar-thumbnail-wont-save-after-upload

FIX: avatar thumbnail won't save after upload
Better API for adding on to our Dialect
annotate models
user simulator was bust
digest interfaces returning empty objects (except for id) interface needed correction
group the "suggested topics" by category correctly.

in the past new topics were not prioritizing current category and
new topics in a category were not being inserted before other unread topics
in other categories
Hard merge bro