Merge branch 'master' of /home/vorner/pciids

diff --combined static/screen.css
index 2c199ed9d8b265b0239041dc9ff9aa1ffb7147a5,0f2395c2d8350f750deccf4ecc2c7e8f3562ed25..9b65e3875ba64e8681a1e4c4cd81bf24bc3d514e
--- 1/static/screen.css
--- 2/static/screen.css
+++ b/static/screen.css
@@@ -89,6 -89,7 +89,7 @@@ div.bluesquare-exampl
        background-color: #4c3bff;
        color: #fffa45;
        border: solid blue;
+       border-width: 1px;
  }
  div.rmenu,
  div.lmenu
@@@ -132,10 -133,3 +133,10 @@@ form.admin tabl
  {
        background: #BBBBFF;
  }
 +.header
 +{
 +      background-color: #4c3bff;
 +      color: #fffa45;
 +      border: solid blue;
 +      border-width: 1px;
 +}