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

This reverts commit b264eef8b8f8c0fd1b508954da7215db9d5c7df1.
Revert "Revert "[merge] from SWGEmu unstable branch 24OCT14""

This reverts commit b4cd0e6c47ee93d0d66b531c02eb30c54b2697f5.
[merge] SWGEmu Unstable branch 27OCT14