Merge branch 'master' of https://github.com/EQEmu/Server into lsid

# Conflicts:
#	common/ruletypes.h
#	world/net.cpp
#	zone/bot_command.cpp
#	zone/command.cpp
#	zone/zonedb.cpp

common/string_util.cpp

@@ -526,4 +526,4 @@ bool isAlphaNumeric(const char *text)
 	}
 
 	return true;
-}
+}