setting battle state on init
removed white space
Merge pull request #12 from CandyCurt/xmas-2013

Add 'end' to OnReward event and put mapannounces to a subroutine
fixed the gmcommand
fixed Yellow Present on shipping helper
Client-data update
more client changes
Fixed Orum to set bad to skip Warrick dialogue
mapflag to keep people from logging out in middle of event and showing back up on map
got the import missed the map flag
Merge branch 'stable-test' of https://github.com/wushin/tmwa-server-data into xmas-2013