Merge branch 'stable-test' of https://github.com/wushin/tmwa-server-data into xmas-2013
Flesh out Akseli dialogue
Merge branch 'xmas-2013' of https://github.com/CandyCurt/tmwa-server-data into xmas-2013