Changes to server
Merge branch 'master' of https://github.com/FallingReign/AdventureCmd

Conflicts:
	Adventure.sdf
	Adventure.v12.suo
	AdventureNet/Debug/AdventureNet.log
	AdventureNet/Debug/AdventureNet.tlog/AdventureNet.lastbuildstate
	AdventureNet/Debug/AdventureNet.tlog/CL.read.1.tlog
	AdventureNet/Debug/AdventureNet.tlog/CL.write.1.tlog
	AdventureNet/Debug/AdventureNet.tlog/Lib-link.read.1.tlog
	AdventureNet/Debug/AdventureNet.tlog/Lib-link.write.1.tlog
	AdventureNet/Debug/AdventureNet.tlog/cl.command.1.tlog
	AdventureNet/Debug/AdventureNet.tlog/lib.command.1.tlog
	AdventureNet/Debug/NetAddress.obj
	AdventureNet/Debug/NetBuffer.obj
	AdventureNet/Debug/NetSocket.obj
	AdventureNet/Debug/UdpSocket.obj
	AdventureNet/Debug/vc120.idb
	AdventureNet/Debug/vc120.pdb
	AdventureNet/lib/AdventureNet_d.lib
	AdventureServer/Debug/AdventureServer.log
	AdventureServer/Debug/AdventureServer.tlog/AdventureServer.lastbuildstate
	AdventureServer/Debug/AdventureServer.tlog/CL.read.1.tlog
	AdventureServer/Debug/AdventureServer.tlog/CL.write.1.tlog
	AdventureServer/Debug/AdventureServer.tlog/cl.command.1.tlog
	AdventureServer/Debug/AdventureServer.tlog/link.command.1.tlog
	AdventureServer/Debug/AdventureServer.tlog/link.read.1.tlog
	AdventureServer/Debug/AdventureServer.tlog/link.write.1.tlog
	AdventureServer/Debug/main.obj
	AdventureServer/Debug/vc120.idb
	AdventureServer/Debug/vc120.pdb
	Debug/AdventureServer.exe
	Debug/AdventureServer.ilk
	Debug/AdventureServer.pdb
Merge branch 'master' of https://github.com/FallingReign/AdventureCmd