adds integration tests for notifications dropdown in header
Relation#all deprecation warning fix for Rails 4
Improve how banned fields are rendered on admin user page
Fix [object object] being rendered where it should be an ip address
Sidetiq::Clock#start is deprecated. Remove it.
Avoid deprecation warning about whitelist_attributes in rails 4
The entire notification when there are new topics is clickable
Merge pull request #1618 from railsaholic/rails4_spec_deprecation_warning_fix

Relation#all deprecation warning fix for Rails 4
User invites page now has search, displays first `invites_shown` records
Adjust margins of ul, ol: they were slightly to the left
we don't need this backport
fix Rails 4 multisite so connection handlers don't keep spinning up new pools
move dbs into git ignored area
Update client.zh_CN.yml
Merge pull request #1619 from ofgeek/patch-1

Update client.zh_CN.yml
ninja_edit_window is is seconds, not minutes
keep track of the user who revised a post
update fog gem
fix avatars:regenerate rake task
fix for emoji precompile