FIX: `sed` on OSX sucks and doesn't work with the same commands as on
most Linux machines. This regexp is compatible with both.
Update pt_BR translations from Transifex. Thanks, translators
Let's not show tons of extra information about invites unless you're the
person who invited them.
FIX: Update ember-cloaking. Should fix some vanishing posts
Show parent category on category badges
added the header shadow back in
Merge pull request #2163 from awesomerobot/master

added the header shadow back in
Merge pull request #2162 from archon432/master

'Topics' are capitalized
Some tweaks to sub-category badges
clarity: change flag "Notify" to "Private message"
Clean up site_settings.yml

 - Hide several variables that the client does not use
 - Use concise default syntax when possible
Shuffle around the order of site settings

The goal of this is twofold:
 - Make the more commonly changed settings higher
 - Find groups for more uncategorized settings

Additionally, the SEO category was deleted, its contents folded into Security and Spam.
make setting descriptions less big/dark
make user setting desc less big/dark
add additional reply via email help text example
clarify this is an incoming-only email
make header only box-shadow on bottom
tighten up problem messages display
Update client.zh_CN.yml

I have to say it's not a pleasure experience to update locale file. It seems Transifex doesn't sync  properly.
Merge pull request #2164 from fantasticfears/patch-1

Update client.zh_CN.yml