Changed timeout
Ping timeout
Merge branch 'ping-timeout' into gitter

Conflicts:
	javascript/transport/web_socket.js