Minor updates to nations and locations. Added the Merchant Background, and updates the NPC html to use more JQuery.
Merge branch 'master' of https://github.com/almightynassar/shapies