Merge branch 'master' into 'master'

Marius Cramer

2015-06-03 c3fab8f2cdf92d6b9d66202e3210cc01e5c53db5

 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();
   }