Merge pull request #10 from CandyCurt/xmas-2013

Xmas 2013
removed trailing white space
Merge branch 'stable-test' of https://github.com/wushin/tmwa-server-data into xmas-2013

Conflicts:
	world/map/npc/030-4/mana_battery.txt