package update
Merge branch 'master' of wondger:wondger/1935

Conflicts:
	package.json
socket update
Merge branch 'master' of wondger:wondger/1935
socket