Allow chatting in battles while disabling lobby chat
Implement /hotpatch formats
Implement sockjs hack for Heroku

See https://github.com/sockjs/sockjs-node/issues/57#issuecomment-5242187
Merge remote-tracking branch 'upstream/master'

Conflicts:
	chat-commands.js
Merge branch 'master' of https://github.com/kupochu/Pokemon-Showdown