Revert "[merge] with SWGEmu unstable branch 24OCT14"

This reverts commit 71af23d9fb464d0be1bc4881b91634fa87c6898f.