update socket port
Merge branch 'master' into chatroom-server

Conflicts:
	public/js/index.js