Merge remote-tracking branch 'amarx/ACCOUNTING' into next

Conflicts:
	make.sh

diff --cc make.sh
index 4b94c8fed184c499d4185e7c78c24494786dae94,d405a05d00f4b6d824f630558f35398cab5ac035..88e710bf340b07d2b5be65846b93d84346a2ed10
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -811,7 -810,8 +811,9 @@@ buildipfire() 
    ipfiremake sslscan
    ipfiremake owncloud
    ipfiremake bacula
 +  ipfiremake batctl
+   ipfiremake perl-PDF-API2
+   ipfiremake squid-accounting
  }
  
  buildinstaller() {