Merge pull request #3 from TEdit/master

Import latest updates - 14216.20
Consolidating settings file versions

Preparation to remove settings_1.2.4.1.xml in favor of primary
settings.xml
Update settings.xml

Manual nudge for compatibility.
Update settings.xml

Manual nudge for compatibility (try 2)
Extensive changes to World Properties user control

Added/updated controls for world features -- moon, backgrounds, renamed
"Mech Boss #" flags, added Saved Angler flag

Also fixes issue #455 (Invasion types - add pirates)
Merge remote-tracking branch 'origin/master'

Conflicts:
	TEditXna/settings.xml
Resolve merge conflicts