[merge] SWGEmu unstable branch 23AUG14