Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	server/tornadio2/__init__.pyc
	server/tornadio2/conn.pyc
	server/tornadio2/flashserver.pyc
	server/tornadio2/periodic.pyc
	server/tornadio2/persistent.pyc
	server/tornadio2/polling.pyc
	server/tornadio2/preflight.pyc
	server/tornadio2/proto.pyc
	server/tornadio2/router.pyc
	server/tornadio2/server.pyc
	server/tornadio2/session.pyc
	server/tornadio2/sessioncontainer.pyc
	server/tornadio2/stats.pyc