Merge branch 'master' into 'dosc-programming'

# Conflicts:
#   sidebars.js

sidebars.js

@@ -1,14 +1,13 @@
-module.exports = {
+module.exports = {
   docs: [
     {
       type: 'category',
       label: 'Общая информация',
       collapsed: false,
       items: [
+        'motivation',
         'robossembler-overview',
-        'plan',
-        'replication',
-		'mining'
+        'plan'
       ],
     },
     {
@@ -31,9 +30,14 @@
         'technologies/wood',
         'technologies/machine-learning-in-robotics',
         'technologies/gripper-tools-research',
+<<<<<<< sidebars.js
         'technologies/o2ac-repo-review',
         'technologies/moveit2.md',
-        'technologies/dds_and_ros2.md'
+        'technologies/dds_and_ros2.md',
+        'technologies/plansys2'
+=======
+        'technologies/plansys2'
+>>>>>>> sidebars.js
       ],
     },
     {
@@ -58,6 +62,8 @@
       label: 'Разное',
       collapsed: false,
       items: [
+        'replication',
+        'mining',
         'glossary',
         'analogy',
       ],