Merge remote-tracking branch 'origin/master'

# Conflicts:
#	changelog.md

Author: Blari

changelog.md

@@ -1,10 +1,19 @@
 # Changelog
 
-## [1.0.4]
+## [1.0.6]
 
 ### Fixed
 - Fix links in settings
 
+## [1.0.5]
+
+- Updated documentation
+
+## [1.0.4]
+
+### Fixed
+- Change badge text in the sidebar
+
 ## [1.0.3]
 
 ### Fixed

src/app/modules/documentation/pages/overview-page/overview-page.component.html

@@ -28,6 +28,13 @@
         <li>Fully Documented Codebase</li>
         <li>And even more coming soon!</li>
       </ul>
+
+      <mat-card-title>
+        <p>Support forum</p>
+      </mat-card-title>
+
+        <p class="lead">For any additional information please go to our <a href="https://flatlogic.com/forum" target="_blank" rel="noopener noreferrer">Support forum</a> and raise your questions or feedback provide there. We highly appreciate your participation!</p>
+
     </mat-card-content>
   </mat-card>
 

src/app/shared/sidebar/sidebar.component.html

@@ -20,7 +20,7 @@
       <div *ngIf="node.name === 'E-commerce'" class="mat-tree-item" matTreeNodeToggle>
         <div>
           <mat-icon>shopping_cart</mat-icon>
-          <p matBadge="NodeJS" matBadgeColor="success">{{node.name}}</p>
+          <p matBadge="NodeJS/.NET" matBadgeColor="success">{{node.name}}</p>
         </div>
         <mat-icon
           [ngClass]="{rotateUp: treeControl.isExpanded(node), rotateDown: !treeControl.isExpanded(node)}"