+collision grid and object types
*test code
Merge branch 'master' of https://github.com/iboB/evoshooter

Conflicts:
	src/ExperimentState.cpp
	src/Object.h