From SVN #440 (6/2/13): "Added terrains as enum, one per tile.
Added ability to block movement into terrains.
Added different move speeds on different terrains (settable on a per-unit basis)
Added concept of world, moved map size and terrains into it
Added CoordinatesOutOfBoundsException, needs to be spread
Made editor accept drags as painting across the dragged squares (refresh rate is a bit slow for that)
Fixed minor problems where:
	Models didn't handle a sent FAILEDPERMANENTLY action
	UnitTemplates had a couple upgrades with the wrong data."

As part of the merge, there was a bit of trouble with both the
abstracting of the model and with the the change from json to xml for
the new game maps.  Also, many of the in-depth tests that svn had
changes for were mysteriously missing.