Merge remote-tracking branch 'origin/master'

Conflicts:
	KB-06/Racer/RaceScene.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	KB-06/KB-06/PEngine.cpp
	KB-06/KB-06/PEngine.h