Remove trailing whitespace
Change space indentation to tabs
Merge conflicts
Azone fix for new compilers and possible fix for x64
Merge https://github.com/EQEmu/Server

Conflicts:
	zone/attack.cpp
	zone/client.cpp
	zone/pets.cpp