Don't clear the clientId
Merge branch 'reset' into gitter

Conflicts:
	javascript/protocol/client.js