Add zh_CN translation for emoji plugin
update rails master
rails master fixes
PERF: remove superflous queries from initial page loads

stop doing expensive work to figure out discourse style sheet
PERF: cache all site_text in memory
FIX: don't put the footer inside a container (allow for full width footers)
FIX: don't put the footer insider container in topic page
Add stringex for Chinese slug generation
Merge pull request #2960 from awesomerobot/master

simplifying the spinner due to IE/Win Chrome issues
FIX: Missing styling for embedded reply
Refactored loading routes for users/badges
Whitelist more loading routes, remove unneeded user loading route.
UX: Don't delay spinner on topic lists or clicking home
Add loading route support to admin flags
FIX: Remove `grouped-each` helper. GroupedView is deprecated in Ember
1.9
Merge pull request #2943 from fantasticfears/slug

Add stringex for Chinese slug generation
PERF: distributed cache class to help sync caches between processes
PERF: use distributed cache for site text and category slugs
only publish distributed cache to user_id -1
Revert "PERF: use distributed cache for site text and category slugs"

This reverts commit a97f2eee054bbd5a252e7cc28ea11210b2a8a82d.