Merge branches 'master' and 'bots' into bots2

Conflicts:
	src/gamelogic/game/g_main.c