Render more traps
Merged with kevin and mike, but crashes randomly.

Merge branch 'enrico-temp' of https://github.com/gotcha84/itsatrap into enrico-temp

Conflicts:
	itsatrap/Common/Debug/Common.log
	itsatrap/ItsATrapClient/Window.cpp
	itsatrap/itsatrap.sdf
	itsatrap/itsatrap.v12.suo