implement hot and cold zones
Better implementation of hot and cold zones
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop

Conflicts:
	src/physic/ContactListener.cpp