[merge] SWGEmu unstable branch 19AUG14