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.
Merge remote-tracking branch 'source/master' into development
Updated / added static files
Hack around backwards incompatible redis change until fixed upstream
Merge pull request #9 from cdman/development

Merge latest changes from upstream.
Merge pull request #10 from cdman/customize_static_files

Customize static files
Merge pull request #11 from cdman/redis_gem_compatibility_hack

Redis gem compatibility hack
Merge pull request #12 from udacity/development

Merged development into master for deployment