Resolve conflicts from @RIonRyan's last commit.
More conflict resolution
And some more conflict resolution.
Optional file associations. Fixes #410
Merge remote-tracking branch 'origin/master'
Merge pull request #404 from NeilWhite/HoneyRendering

Honey Updates
Bug fix for NPC on new world creation.
Merge remote-tracking branch 'origin/master'
Suppress meaningless WIX error message.
Minimap
update versions
super basic version checking
modify version number
Make checking updates optional and add manual update button.
fix command binding
Merge branch 'master' of https://github.com/NeilWhite/Terraria-Map-Editor