[merge] SWGEmu unsstable branch 02AUG14