Merge remote-tracking branch 'origin/master' into simulator-robot-simplify

# Conflicts:
#	images/content/simulator/robot-front.png
#	images/content/simulator/robot-side.png
#	simulator/index.md

Author: RealOrangeOne

_data/sidebar_tree.yaml

@@ -3,13 +3,13 @@
 tree:
   - url: /
     title: Introduction
-  - url: /competition-simulator
-    title: Competition Simulator
+  - url: /simulator
+    title: Simulator
     tree:
-      - url: /competition-simulator/programming
+      - url: /simulator/programming
         title: Programming
         tree:
-          - url: /competition-simulator/programming/time
+          - url: /simulator/programming/time
             title: Time
   - url: /IDE/
     title: IDE
@@ -85,8 +85,6 @@ tree:
           title: Markers
     - url: /programming/git_repositories
       title: Git Repositories
-    - url: /programming/simulator
-      title: Simulator
   - url: /rules/
     title: Rules
     tree:

images/content/competition-simulator/arena.png renamed to images/content/simulator/arena.png

@@ -6,8 +6,8 @@ title: Included Python Libraries
 Included Libraries
 ==================
 
-Competition Simulator
----------------------
+Simulator
+---------
 
 The following libraries will be available to your robot code during the
 competition. Note that for local development you will need to install these

images/content/competition-simulator/robot-side.png renamed to images/content/simulator/robot-side.png

@@ -35,9 +35,9 @@ R = Robot()
 <div class="warning">
   <!-- We should drop this after SR2020 and move `ManualTimestepRobot` to being the default. -->
 
-  When programming for the <a href="/docs/competition-simulator">Competition Simulator</a>
+  When programming for the <a href="/docs/simulator">Competition Simulator</a>
   you are strongly encouraged to use the
-  <a href="/docs/competition-simulator/programming/time#manual-timestep-robot">
+  <a href="/docs/simulator/programming/time#manual-timestep-robot">
     <code>ManualTimestepRobot class</code>
   </a>
   instead of the <code>Robot</code> class. This avoids unpredictable behaviour