Merge branch 'master' into 'devbyspi'

# Conflicts:
#   Layout/default/Device/Detail.php
#   Layout/default/Device/Form.php
#   Layout/default/Device/Index.php
#   application/Device/DeviceController.php
#   application/Device/DeviceModel.php
#   public/assets/css/datatables-std.css

public/assets/css/datatables-std.css

@@ -32,10 +32,6 @@
     width: 50px;
 }
 
-.edit-width-large {
-    width: 100px;
-}
-
 .order-date-pill {
     margin: 2px;
     white-space: nowrap;
@@ -43,41 +39,4 @@
 
 .font-weight-500 {
     font-weight: 500;
-}
-
-.history-ico {
-    color: #007bff;
-    cursor: pointer;
-}
-
-.history-ico:hover {
-    color: #006875;
-
-}
-
-.code-ico {
-    cursor: pointer;
-    font-size: 25px;
-    margin-top: 7px;
-    margin-left: 10px;
-}
-
-.spinner-ico {
-    margin-left: 5px;
-}
-
-.filestore-history {
-    background-color: #33ff0021 !important;
-}
-
-.filestore-history-td {
-    padding: 0 0px 0 10px !important;
-    box-shadow: unset;
-}
-.filestore-history-td:hover {
-    box-shadow: unset !important;
-}
-.filestore-history-tr:hover{
-    color: unset !important;
-    background-color: #fff !important;
 }