Changed player swapping between servers
Merge branch 'wsswap'

Conflicts:
	js/sangraama/aoihandler.js
	js/sangraama/wshandler.js