Remove trailing whitespace
Change space indentation to tabs
Merge conflicts
Azone fix for new compilers and possible fix for x64
Merge pull request #4 from EQEmu/master

Sync 2013-05-16