faye
chats
Merge branch 'master' into faye

Conflicts:
	Gemfile.lock
Merge branch 'master' into faye
auth
sidekiq
no message
disable datapicker & meta_request
no message