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

Conflicts:
	changelog.txt

zone/entity.cpp

@@ -4170,6 +4170,20 @@ void EntityList::SignalAllClients(uint32 data)
 	}
 }
 
+uint16 EntityList::GetClientCount(){
+	uint16 ClientCount = 0;
+	std::list<Client*> client_list;
+	entity_list.GetClientList(client_list);
+	std::list<Client*>::iterator iter = client_list.begin();
+	while (iter != client_list.end()) {
+		Client *entry = (*iter);
+		entry->GetCleanName();
+		ClientCount++;
+		iter++;
+	}
+	return ClientCount;
+}
+
 void EntityList::GetMobList(std::list<Mob *> &m_list)
 {
 	m_list.clear();