Merge remote-tracking branch 'wushin/stable-test' into stable-test

Conflicts:
	world/map/npc/030-4/mana_battery.txt
Merge remote-tracking branch 'tux/heat-spell' into stable-test
Merge remote-tracking branch 'tux/dungeon' into stable-test

Conflicts:
	world/map/db/mob_db.txt
Add Green Sunshade, Tam O'Shanter, Mysterious Mask
Merge branch 'hats' into stable-test