Adding xmas boss fight
Fixing bossfight
Merge remote-tracking branch 'wushinfork/xmas-2013' into xmas-2013

Conflicts:
	world/map/npc/annuals/xmas/config.txt
	world/map/npc/annuals/xmas/debug.txt
Merge remote-tracking branch 'wushinfork/xmas-2013' into xmas-2013
Adding Christmas Sweaters
Merge branch 'xmas-2013' of https://github.com/wushin/tmwa-server-data into xmas-2013

Conflicts:
	world/map/db/item_db.txt
Merge pull request #2 from CandyCurt/xmas-2013

Xmas 2013