Use Strophe loggers in websockets
Merge branch 'websocket' into disconnect-fix

Conflicts:
	src/websocket.js