Merge pull request #24 from EQEmu/master

Merge of 11-23-2014
Merge https://github.com/Kinglykrab/Server