Merge branch 'master' into webserver2

Author: cjakeman

contribute/developing-code/index.php

@@ -64,7 +64,7 @@
 To compile and debug the Open Rails source code, ensure you have the following Microsoft products installed:
       </p>
       <ul>
-        <li>Visual Studio 2015/17/19, any edition. The 
+        <li>Visual Studio 2017 or 2019, any edition. The 
           <a href="https://www.visualstudio.com/downloads/">Community Edition</a> 
          is free
 		 <br />(Note 1: To save on disk space, all you need is the option Windows > .NET Development)

index.php

@@ -178,7 +178,7 @@
                 <a href="http://www.zigzag.coalstonewcastle.com.au/route/downloads/" title="Tutorials in this kit will help you to learn the rudimentary controls in Open Rails, how to drive a steam locomotive, operate the air brakes to stop the train, to turn the locomotive on a turntable, to fuel locomotive with water and coal, and also how to shunt cars and wagons"><img src="landing_page_ctn.png"></a>
               </div>
             </div>
-            <!-- <div class="user-existing col-md-6">
+            <div class="user-existing col-md-6">
               <div class="user-content">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h1>Already using Open Rails?</h1>
@@ -187,16 +187,16 @@
                 <p>This route has been updated for Open Rails to optimise physics and sound</p>
                 <a href="http://www.trainsimulations.net/ORTS_starter_pack.html"><img src="landing_page_ts.png"></a>
               </div>
-            </div> -->
-            <div class="user-existing2 col-md-6">
+            </div>
+            <!-- <div class="user-existing2 col-md-6">
               <div class="user-content">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h1>Already using Open Rails?</h1>
                 <h1>Try the <strong><a href="http://www.siskurail.org" title="The Central Oregon and Pacific Railroad operates between Northern California and Eugene, Oregon, USA.">Siskiyou Route</a></strong></h1>
                 <p>This extensive route, created by Dale Rickert, has over 300 miles of mainline track passing through 31 cities and comes with nearly 150 locos and 350 wagons.</p>
                 <a href="http://www.siskurail.org" title="The Central Oregon and Pacific Railroad operates between Northern California and Eugene, Oregon, USA."><img src="landing_page_dr.png"></a>
               </div>
-            </div>
+            </div>-->
           </div><!-- End of Modal content -->
         </div><!-- End of Modal dialog -->
       </div><!-- End of Modal -->

trade/index.php

@@ -34,13 +34,13 @@
 These vendors sell or create products suitable for Open Rails:
 </p>
 <ul>
+  <li><a href="http://www.trainsimulations.net/">TrainSimulations</a> - Canada</li>
+  <li><a href="http://pikku.msts.cz/openrails.html">Pikku Locomotive Works</a> - Czechoslovakia</li>
+  <li><a href="http://broadgaugeproduction.irts.in/">Broad Gauge Productions</a> - India</li>  
   <li><a href="http://www.3dtrains.com" target="_blank">3DTrains</a> - USA</li>
-  <li><a href="http://www.conbuilder.com" target="_blank">ConBuilder</a> - Utility Suite</li>
   <li><a href="http://dekosoft.com/trains">Dekosoft Trains</a> - USA</li>
-  <li><a href="http://pikku.msts.cz/openrails.html">Pikku Locomotive Works</a> - Czechoslovakia</li>
-  <li><a href="http://www.trainsimulations.net/">TrainSimulations</a> - Canada</li>
   <li><a href="http://www.gabriele90.com/">Gabriele 90</a> - Italy</li>
-  <li><a href="http://broadgaugeproduction.com/">Broad Gauge Productions</a> - India</li>  
+  <li><a href="http://www.conbuilder.com" target="_blank">ConBuilder</a> - Utility Suite</li>
 </ul>
 <p>&nbsp;</p>
 <h2>Vendors Supporting MSTS</h2>