* Merchants fixes.
		Patch by: Pandragon
		Reviewed by: jurchiks, Zoey76
	* Fairy Tree AI fixes.
		Patch by: Pandragon
		Reviewed by: Sdw, Nos, St3eT, Zoey76