wip: still working on channeling system.
merge.

Conflicts:
	itsatrap/Common/Debug/Common.log
	itsatrap/Common/StateLogic.cpp
	itsatrap/Debug/Common.dll
	itsatrap/Debug/Common.exp
	itsatrap/Debug/Common.lib
	itsatrap/Debug/Common.pdb
	itsatrap/Debug/ItsATrapClient.exe
	itsatrap/Debug/ItsATrapClient.pdb
	itsatrap/Debug/ItsATrapServer.exe
	itsatrap/Debug/ItsATrapServer.pdb
	itsatrap/itsatrap.sdf
	itsatrap/itsatrap.v12.suo