Merge branch 'dev' into system

# Conflicts:
#	src/assets/sass/utils.scss

src/assets/sass/common.css

@@ -350,6 +350,7 @@ h3 {
   transition: width 0.28s;
   width: 210px !important;
   background-color: #f0f4fa;
+  border: none;
   padding: 10px;
   height: 100%;
   position: fixed;

src/assets/sass/sidebar.scss

@@ -10,6 +10,7 @@
     transition: width 0.28s;
     width: $sideBarWidth !important;
     background-color: #f0f4fa;
+    border: none;
     padding: 10px;
     height: 100%;
     position: fixed;

src/assets/sass/utils.scss

@@ -143,7 +143,7 @@ h3 {
   text-align: right;
 }
 .container {
-  padding: 20px;
+  padding: 20px 20px 20px 10px;
   //margin: 15px;
   //background: #fff;
 }