going back to c++03
Merge branch 'master' into basic3d

Conflicts:
	game/makefile