Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb

This reverts commit 8c0bc4b9.

This reverts commit d55c0ae5.