[merge] SWGEmu unstable brancg 21AUG14 22:16:22 (test)