staff can always upload a file
inject currentUser into controllers & routes

Through Ember's DI, instead of doing so via a mixin.
rake task to regenerate avatars
Update client.zh_CN.yml
Extracted nickname registration out of the UsersController and into its
own service.
fixed ruby 2.0 p0 bug in fast_stack so re-pushing
Put category description in meta description tag
Merge pull request #1421 from ofgeek/patch-2

Update client.zh_CN.yml
Merge pull request #1420 from ZogStriP/rake-task-to-regenerate-avatars

rake task to regenerate avatars
Merge pull request #1418 from goshakkk/inject-current-user

Inject currentUser into controllers & routes
Merge pull request #1404 from ZogStriP/admin-can-always-upload-a-file

staff can always upload a file
Don't show approval on admin user page if the site doesn't require approval of users (must_approve_users)
FIX: Regression that removed the ability to quote code
Trivial: Rename dialect action to block quotes rather than simple quotes
Merge pull request #1423 from einarj/nickname_registration_service

Nickname registration service object
Updated German locale: direct replies, mobile/desktop view and private message labels
Move the unique post key storage code into the Post model
Use `no-cache` in development mode for assets. Using `must-revalidate`, which is
Rails' default, seems to have Chrome sometimes not request assets in development
mode even though it's supposed to revalidate every time.
bugfix: when expanding "1 person flagged for moderation" target post is not clickable
improve secure_category_id query