moving get_combat_form down
Merge branch 'experimental_temp' into experimental

Conflicts:
	RNG.lua