minor change
Merge remote-tracking branch 'origin/master'

Conflicts:
	release/game.cpp
	release/game.h