Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade

 server/plugins-available/firewall_plugin.inc.php

@@ -38,7 +38,7 @@
   public function onInstall() {
      global $conf;

      if($conf['bastille']['installed'] = true && $conf['services']['firewall'] == true) {
      if($conf['bastille']['installed'] == true && $conf['services']['firewall'] == true) {
         return true;
      } else {
         return false;