1230PM13
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameLayer.cpp
	GameLayer.h