[merge] SWGEmu unstable 29AUG14