tweaked some teleport code
Merge remote branch 'origin' into general-devel
Merge remote branch 'origin' into general-devel
binary wouldn't auto merge
Merge remote branch 'origin' into general-devel

Conflicts:
	TerrariaServerBins/TerrariaServer.exe
Merge remote branch 'origin' into general-devel
Fixes ice breaking by falling (for real)