State updates implemented
Merge branch 'andre' of https://github.com/gotcha84/itsatrap into andre

Conflicts:
	itsatrap/Debug/ItsATrapClient.exe
	itsatrap/Debug/ItsATrapClient.ilk
	itsatrap/Debug/ItsATrapClient.pdb
	itsatrap/itsatrap.suo