a
Merge branch 'master' of https://github.com/ErPanfi/ProjectHCI

Conflicts:
	ProjectHCI/KinectEngine/SpawnerManager/SpawnerTestForCollisionManager.cs