Renaming item 542 to Shifting Sands

Adding item 905 named Bottle of Sand
Mobs now drop modified version of Bottles of Sand

FireGoblin, AngryFireGoblin & GiantMaggot
Added Heatwave

Elemental Opposite of Kaflosh
They weaken each other till one disapates
Parcival will now teach heat spell.
Adding Mobs and run 'make mobxp'
	* Troll
	* UndeadWitch
	* UndeadTroll
run 'make maps' for client-data changes related to adding new mobs.
Merge remote-tracking branch 'tmworigserverdata/master' into heat-spell

Conflicts:
	client-data
Add Green Sunshade, Tam O'Shanter, Mysterious Mask
Xmas Chamber Fixes
- Should no longer get stuck
- Has a bit more challenge to sitting
- Cooldown in between rounds to allow changing of the guard
- Allowing Entry/Exit but not Start
Xmas Reward/Event time fixed to properly display proper event mode
Make Pollett drop Pollett Egg, Fix Chamber Lockup more, Fix Typos
Add some info to present NPCs
Merge remote-tracking branch 'tux/dungeon' into stable-test
Merge remote-tracking branch 'tux/heat-spell' into stable-test

Conflicts:
	world/map/db/mob_db.txt
Merge branch 'hats' into stable-test
Merge branch 'XmasFix' into stable-test

Conflicts:
	world/map/db/mob_db.txt