Merge branch 'master' into 'master'

Marius Burkard

2016-01-10 c2dd9c58d6d3590c519e42bb2ec8e6a56e071118

 interface/web/tools/interface_settings.php

@@ -126,7 +126,7 @@
         print '<script type="text/javascript">document.location.reload();</script>';
         exit;
      }
      else parent::onShow();
      //else parent::onShow();
   }