moved some variables (human/alien) in an array of structs
Merge remote-tracking branch 'remotes/bmorel/gameplay/master' into gameplay/master
Improve refactoring 7e453cb. Fix a crash.
Merge branch 'gameplay/master' into gameplay/viech

Conflicts:
	src/gamelogic/game/g_buildable.c
	src/gamelogic/game/g_local.h
Merge branch 'gameplay/viech' into bots+viech

Conflicts:
	src/gamelogic/game/g_main.c