save
Merge branch 'master' of https://github.com/pkonovalov-softheme/ii

Conflicts:
	Core/ChallengeManager.cpp
	Core/ChallengeManager.h
	Core/EntityGenerator.cpp
	CoreTests/ChallengeManagerTests.cpp
	CoreTests/EntityGeneratorTests.cpp
correction after merge
save
temp save
All works after reusing one entity + little perf optimization
Add more correct performance testing
Correction in the performance testing
correction