dd
Merge remote-tracking branch 'origin'

Conflicts:
	app/services/socket_client_manager.rb
3jiji