Merge branch 'master' into pisteampackerconfig

# Conflicts:
#	libs/client_server/piclientserver_server.cpp
#	libs/crypt/picrypt.cpp
#	libs/io_utils/pistreampacker.cpp
#	main.cpp

libs/main/client_server/piclientserver_server.h

@@ -49,6 +49,7 @@ public:
 	void listen(PINetworkAddress addr);
 	void listenAll(ushort port) { listen({0, port}); }
 
+	void stopServer();
 	void closeAll();
 
 	int getMaxClients() const { return max_clients; }
@@ -59,7 +60,6 @@ public:
 	void setClientFactory(std::function<ServerClient *()> f) { client_factory = f; }
 
 private:
-	void stopServer();
 	void newClient(ServerClient * c);
 	void clientDisconnected(ServerClient * c);