Merge pull request #1 from EQEmu/master

Sync 2013-05-08
Merge branch 'master' of git://github.com/EQEmu/Server
Merge pull request #2 from EQEmu/master

Sync 2013-05-11
Merge pull request #3 from EQEmu/master

Sync 2013-05-12
Merge pull request #4 from EQEmu/master

Sync 2013-05-16
Merge pull request #5 from EQEmu/master

Sync 2013-05-22
added std:: to a lot of locations which where
missed and added NOMINMAX to cmakelist
Merging
Windows compile fix
Merge branch 'master' into string
Merge pull request #6 from EQEmu/master

Sync 2013-05-23
Windows compile fixes (bots)
Merge pull request #64 from af4t/master

Windows compile fix: bots
Merge and a few cleanup / bug fixes
Merge branch 'master' of https://github.com/EQEmu/Server into string
Merge branch 'master' into small_stage_cleanup

Conflicts:
	common/EQStream.cpp
	zone/client.h