i003_z001_04
i003_z001_04
i003_z001_04
Merge branch 'i003_z001_04' into i003

Conflicts:
	HandDetector/lazygame/HandDetectorTester.cpp
	HandDetector/lazygame/HandDetectorTester.h
	HandDetector/lazygame/Main.cpp