Merge branch 'master' of https://github.com/abouolia/Ratteb

# Conflicts:
#	client/src/lang/en/index.js

client/src/style/pages/items.scss

@@ -95,6 +95,9 @@
             color: #9eaab6;
           }
         }
+        .quantity_on_hand {
+          color: #ff0000;
+        }
       }
     }
   }