Reset method
Don't clear the clientId
Merge branch 'reset' into gitter-dispatcher

Conflicts:
	javascript/protocol/client.js
	spec/javascript/client_spec.js