Merge branch 'guardian-improved' into guardian-2.0

Conflicts:
	make.sh

diff --cc html/cgi-bin/ids.cgi
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge

diff --cc make.sh
index 2b24e1159e82b7a1d5344a7de2f125c3b9d7c5b5,03f1886e4ec810762ab0db2c70da66400c5649ee..0074ffd6a464b23076572c877cd0aede90632319
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -809,11 -804,8 +809,13 @@@ buildipfire() 
    ipfiremake iotop
    ipfiremake stunnel
    ipfiremake sslscan
 +  ipfiremake owncloud
 +  ipfiremake bacula
 +  ipfiremake batctl
 +  ipfiremake perl-PDF-API2
 +  ipfiremake squid-accounting
+   ipfiremake perl-common-sense
+   ipfiremake perl-inotify2
  }
  
  buildinstaller() {