updates
Merge branch 'new'

Conflicts:
	js/server/exchange.js
update sockets
empty description
Merge branch 'new'