Updated Carpet NPCs ref #1259 and map fixes

map fixes:
• fixed borders near edron
• fixed tile near svargrond carpet
Minor changes & Indentation, cheers @ninjalulz
Minor changes & Indentation, cheers
Minor changes & indentation, cheers @ninjalulz
Revert spawn.xml
Merge pull request #1272 from xWhiteTiger/master

Updated Carpet NPCs ref #1259 and map fixes