Merge branch 'Sprite-Npc-1.5' of https://github.com/wushin/tmwa-client-data into sprite-1.5

Conflicts:
	graphics/sprites/equipment/chest/contributor-female.png
	graphics/sprites/equipment/chest/contributor-male.png
	graphics/sprites/equipment/chest/tnecksweater-female.png
	graphics/sprites/equipment/chest/tnecksweater-male.png
	graphics/sprites/equipment/hands/magefire.xml
	graphics/sprites/equipment/head/axehat.xml
	graphics/sprites/equipment/head/bandana.xml
	graphics/sprites/equipment/head/bowler-hat-brown.xml
	graphics/sprites/equipment/head/bowler-hat.xml
	graphics/sprites/equipment/head/bromenalhelmet.xml
	graphics/sprites/equipment/head/bunnyears.xml
	graphics/sprites/equipment/head/cap.xml
	graphics/sprites/equipment/head/captain-hat.xml
	graphics/sprites/equipment/head/catears.xml
	graphics/sprites/equipment/head/chefhat.xml
	graphics/sprites/equipment/head/christmastree.xml
	graphics/sprites/equipment/head/circlet.xml
	graphics/sprites/equipment/head/cowboyblack.xml
	graphics/sprites/equipment/head/cowboywhite.xml
	graphics/sprites/equipment/head/crown.xml
	graphics/sprites/equipment/head/crusadehelm.xml
	graphics/sprites/equipment/head/demonmask.xml
	graphics/sprites/equipment/head/desert-helmet.xml
	graphics/sprites/equipment/head/devcap.xml
	graphics/sprites/equipment/head/earmuffs.xml
	graphics/sprites/equipment/head/elf-nightcap.xml
	graphics/sprites/equipment/head/eyepatch.xml
	graphics/sprites/equipment/head/fairy_hat.xml
	graphics/sprites/equipment/head/fancyhat.xml
	graphics/sprites/equipment/head/funkywinter.xml
	graphics/sprites/equipment/head/gmcap.xml
	graphics/sprites/equipment/head/goblin-mask.xml
	graphics/sprites/equipment/head/goggles.xml
	graphics/sprites/equipment/head/gradcap.xml
	graphics/sprites/equipment/head/guyfawkes.xml
	graphics/sprites/equipment/head/heart-glasses.xml
	graphics/sprites/equipment/head/highpriest-crown-female.xml
	graphics/sprites/equipment/head/infantryhelm.xml
	graphics/sprites/equipment/head/knighthelm.xml
	graphics/sprites/equipment/head/magicgmtophat.xml
	graphics/sprites/equipment/head/minershat.xml
	graphics/sprites/equipment/head/monocle.xml
	graphics/sprites/equipment/head/monster-skull-helm.xml
	graphics/sprites/equipment/head/mouboohead.xml
	graphics/sprites/equipment/head/mushroom.xml
	graphics/sprites/equipment/head/nohmask.xml
	graphics/sprites/equipment/head/operamask.xml
	graphics/sprites/equipment/head/overlordhelm.xml
	graphics/sprites/equipment/head/paladinhelm.xml
	graphics/sprites/equipment/head/panhat.xml
	graphics/sprites/equipment/head/paperbag.xml
	graphics/sprites/equipment/head/parsley-earplugs.xml
	graphics/sprites/equipment/head/pinkiehat.xml
	graphics/sprites/equipment/head/piratehat.xml
	graphics/sprites/equipment/head/pumpkinhelmet.xml
	graphics/sprites/equipment/head/rabbit-ears.xml
	graphics/sprites/equipment/head/rangerhat.xml
	graphics/sprites/equipment/head/rednose.xml
	graphics/sprites/equipment/head/rosehat.xml
	graphics/sprites/equipment/head/sailor-hat.xml
	graphics/sprites/equipment/head/santabeardhat.xml
	graphics/sprites/equipment/head/santahat.xml
	graphics/sprites/equipment/legs/silkpants-male.png
	graphics/sprites/model/male.xml
	graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml
	graphics/sprites/monsters/mana-ghost.xml
	graphics/sprites/monsters/skeleton_inv.xml
	graphics/sprites/monsters/wight.xml
	graphics/sprites/npcs/bones.xml
	graphics/sprites/npcs/koga.xml
	graphics/sprites/npcs/npc-skeletons.xml
	graphics/sprites/npcs/signs.png
	graphics/sprites/npcs/signs.xml
	graphics/sprites/npcs/weaver-wheel.xml
	graphics/sprites/player_female_base.xml
	items.xml
	monsters.xml
	npcs.xml