Optional file associations. Fixes #410
Merge remote-tracking branch 'origin/master'
Bug fix for NPC on new world creation.
Merge remote-tracking branch 'origin/master'