Fixed error with previous fix + another potential hang case
Also modified behaviour with plans to make forced-path testing generate states closer to those generated in normal play
Merge branch 'origin/develop'

Conflicts:
	src/org/ggp/base/player/gamer/statemachine/sancho/Sancho.java