Update Sidekiq and config
implement MemInfo.mem_total on Mac OS X
Update zh_CN and zh_TW to current en.yml
Merge pull request #563 from tangramor/master

Update the zh_CN and zh_TW translations to the latest en.yml
Merge pull request #550 from kubabrecka/memtotal_macos

implement MemInfo.mem_total on Mac OS X
Merge branch 'update-sidekiq' of git://github.com/nverba/discourse

Conflicts:
	config/initializers/sidekiq.rb
Remove the extra column from per_day_counts_report
Fail version_check job silently in development mode
Better error messages when hitting max mentions/images/links