Merge branch 'master' into 'dosc-programming'

# Conflicts:
#   sidebars.js

sidebars.js

@@ -18,7 +18,6 @@ module.exports = {
         'autostorage',
         'information/information_support',
         'information/planner',
-	      'techinstruction'
       ],
     },
     {
@@ -26,14 +25,13 @@ module.exports = {
       label: 'Технологии',
       collapsed: false,
       items: [
-        'technologies/photopolymer',
-        'technologies/wood',
         'technologies/machine-learning-in-robotics',
         'technologies/gripper-tools-research',
-        'technologies/o2ac-repo-review',
-        'technologies/moveit2.md',
-        'technologies/dds_and_ros2.md',
-        'technologies/plansys2'
+        'technologies/wrs2020-assembly-challenge',
+        'technologies/plansys2',
+        'technologies/ASP-overview',
+        'technologies/motion-planning',
+        'technologies/wood',
       ],
     },
     {