this build combines ao 1 and 2

and maybe vno

AOprivateServer.pbp

@@ -7,7 +7,7 @@
   <section name="data">
     <explorer view="" pattern="8"/>
     <log show="1"/>
-    <lastopen date="2016-09-08 17:34" user="Sven" host="SPC"/>
+    <lastopen date="2016-09-14 18:19" user="Sven" host="SPC"/>
   </section>
   <section name="files">
     <file name="Common.pb">
@@ -20,15 +20,15 @@
     </file>
     <file name="main.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="c511df03dc522145f3cd251ae297144b"/>
+      <fingerprint md5="691de80d86078857210071edb15c327d"/>
     </file>
     <file name="server_shared.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="b681484961f858fa550ad315c5471e57"/>
+      <fingerprint md5="e3552c2e56d666d8af17977f94da2b20"/>
     </file>
     <file name="shared_headers.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="eb1b0626c585fce079b8d8baa10e7e06"/>
+      <fingerprint md5="07923d31b54739a5935c53a17c680508"/>
     </file>
   </section>
   <section name="targets">
@@ -41,8 +41,8 @@
       <icon enable="1">sD.ico</icon>
       <format exe="default" cpu="2"/>
       <debugger custom="1" type="ide"/>
-      <compilecount enable="1" value="1220"/>
-      <buildcount enable="1" value="136"/>
+      <compilecount enable="1" value="1270"/>
+      <buildcount enable="1" value="139"/>
       <versioninfo enable="1">
         <field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
         <field1 value="2.%COMPILECOUNT.%BUILDCOUNT,0"/>
@@ -76,8 +76,8 @@
       <icon enable="0">owner.ico</icon>
       <format exe="console" cpu="0"/>
       <debugger custom="1" type="ide"/>
-      <compilecount enable="1" value="1202"/>
-      <buildcount enable="1" value="136"/>
+      <compilecount enable="1" value="1270"/>
+      <buildcount enable="1" value="139"/>
       <versioninfo enable="1">
         <field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
         <field1 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>

base/masterserver.ini

@@ -1,4 +1,5 @@
 [list]
-0 = 54.93.210.149
-1 = 46.188.16.205
-2 = 54.72.209.44
+0 = 51.255.160.217
+#0 = 127.0.0.1
+#0 = 37.120.168.157
+#0 = 46.188.16.205