we can configure terrains in json.
Merge branch 'master' of github.com:badgerman/atlantis
since region.units is not meant to be private, remove the underscore.
verify that units are ordered correctly after loading.

new test does not pass!
order units by buildings.
fix sorting stacked units.
sorting units on ships.
reorder units if they get added again.
sort units during readgame.

backwards compatibility is good.
change how orders are processed that may change unit sorting.
set region to null after removal
Merge branch 'atlas'

Conflicts:
	lib/combat.c
store a set of feature flags.

add a flag for stacks.
Merge branch 'atlas'
fix for duplicate regions.
fix for duplicate regions, fixed.