Index: /code/branches/network/bin/keybindings.ini
===================================================================
--- /code/branches/network/bin/keybindings.ini	(revision 1378)
+++ /code/branches/network/bin/keybindings.ini	(revision 1379)
@@ -1,5 +1,5 @@
 [KeyBinder]
 KeyUNASSIGNED=
-KeyESCAPE= exit
+KeyESCAPE=exit
 Key1=
 Key2=
Index: /code/branches/network/src/network/ConnectionManager.cc
===================================================================
--- /code/branches/network/src/network/ConnectionManager.cc	(revision 1378)
+++ /code/branches/network/src/network/ConnectionManager.cc	(revision 1379)
@@ -70,4 +70,11 @@
     bindAddress.host = ENET_HOST_ANY;
     bindAddress.port = NETWORK_PORT;
+    head_ = head;
+  }
+  
+  ConnectionManager::ConnectionManager(ClientInformation *head, int port){
+    quit=false;
+    bindAddress.host = ENET_HOST_ANY;
+    bindAddress.port = port;
     head_ = head;
   }
Index: /code/branches/network/src/network/ConnectionManager.h
===================================================================
--- /code/branches/network/src/network/ConnectionManager.h	(revision 1378)
+++ /code/branches/network/src/network/ConnectionManager.h	(revision 1379)
@@ -74,4 +74,5 @@
     ConnectionManager();
     ConnectionManager(ClientInformation *head);
+    ConnectionManager(ClientInformation *head, int port);
     ConnectionManager(int port, const char *address, ClientInformation *head);
     ConnectionManager(int port, std::string address, ClientInformation *head);
Index: /code/branches/network/src/network/Server.cc
===================================================================
--- /code/branches/network/src/network/Server.cc	(revision 1378)
+++ /code/branches/network/src/network/Server.cc	(revision 1379)
@@ -66,4 +66,11 @@
     clients = new ClientInformation(true);
     connection = new ConnectionManager(clients);
+    gamestates = new GameStateManager(clients);
+  }
+  
+  Server::Server(int port){
+    packet_gen = PacketGenerator();
+    clients = new ClientInformation(true);
+    connection = new ConnectionManager(clients, port);
     gamestates = new GameStateManager(clients);
   }
Index: /code/branches/network/src/network/Server.h
===================================================================
--- /code/branches/network/src/network/Server.h	(revision 1378)
+++ /code/branches/network/src/network/Server.h	(revision 1379)
@@ -60,4 +60,5 @@
   public:
     Server();
+    Server(int port);
     Server(int port, std::string bindAddress);
     Server(int port, const char *bindAddress);
Index: /code/branches/network/src/orxonox/Orxonox.cc
===================================================================
--- /code/branches/network/src/orxonox/Orxonox.cc	(revision 1378)
+++ /code/branches/network/src/orxonox/Orxonox.cc	(revision 1379)
@@ -170,5 +170,6 @@
     timefactor_(1.0f),
     mode_(STANDALONE),
-    serverIp_("")
+    serverIp_(""),
+    serverPort_(NETWORK_PORT)
   {
   }
@@ -244,4 +245,5 @@
     ar.checkArgument("data", dataPath, false);
     ar.checkArgument("ip", serverIp_, false);
+    ar.checkArgument("port", serverPort_, false);
     if(ar.errorHandling())
       return false;
@@ -357,5 +359,5 @@
     ib->registerListener(console, &Testconsole::execute, '\r', false);
     ib->registerListener(console, &Testconsole::hintandcomplete, '\t', true);
-    ib->registerListener(console, &Testconsole::clear, '§', true);
+    ib->registerListener(console, &Testconsole::clear, '�', true);
     ib->registerListener(console, &Testconsole::removeLast, '\b', true);
     ib->registerListener(console, &Testconsole::exit, (char)0x1B, true);
@@ -365,5 +367,5 @@
     ib->registerListener(orxonoxConsole_, &InGameConsole::execute, '\r', false);
     ib->registerListener(orxonoxConsole_, &InGameConsole::hintandcomplete, '\t', true);
-    ib->registerListener(orxonoxConsole_, &InGameConsole::clear, '§', true);
+    ib->registerListener(orxonoxConsole_, &InGameConsole::clear, '�', true);
     ib->registerListener(orxonoxConsole_, &InGameConsole::removeLast, '\b', true);
     ib->registerListener(orxonoxConsole_, &InGameConsole::exit, (char)0x1B, true);
@@ -379,5 +381,5 @@
     COUT(2) << "Loading level in server mode" << std::endl;
 
-    server_g = new network::Server();
+    server_g = new network::Server(serverPort_);
 
     if (!loadScene())
@@ -399,5 +401,6 @@
       client_g = network::Client::createSingleton();
     else
-      client_g = network::Client::createSingleton(serverIp_, NETWORK_PORT);
+      
+      client_g = network::Client::createSingleton(serverIp_, serverPort_);
 
     client_g->establishConnection();
Index: /code/branches/network/src/orxonox/Orxonox.h
===================================================================
--- /code/branches/network/src/orxonox/Orxonox.h	(revision 1378)
+++ /code/branches/network/src/orxonox/Orxonox.h	(revision 1379)
@@ -105,4 +105,5 @@
       gameMode              mode_;
       std::string           serverIp_;
+      int                   serverPort_;
 
       static Orxonox *singletonRef_s;
