Merge pull request #4 from EQEmu/master

sync
Remove trailing whitespace
Change space indentation to tabs
Merge pull request #5 from EQEmu/master

sync
FreeBSD support and clean up of unnecessary ifdef FREEBSD
CHA scribe rule logic fix
Merge branch 'master' of https://github.com/josheb/Server
Merge pull request #60 from josheb/master

CHA scribe logic fix.
Merge conflicts
Azone fix for new compilers and possible fix for x64
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	common/debug.cpp
	common/debug.h
	zone/PlayerCorpse.cpp
	zone/beacon.cpp
	zone/client.cpp
	zone/net.cpp
	zone/tribute.cpp
Merge branch 'master' into StringFormatting.

Cleaned up the problems. Tested on Linux. Still need to test on windows.

Conflicts:
	common/CMakeLists.txt
	common/MiscFunctions.cpp
	common/MiscFunctions.h
	common/debug.cpp
	world/Adventure.cpp