Merge branch 'rspezial'

Conflicts:

	config/rootfiles/core/15/files
	config/rootfiles/core/15/update.sh
	lfs/collectd
	make.sh

diff --cc doc/packages-list.txt
Simple merge

diff --cc make.sh
index 9206c07c494f10000cc875cee02dc40948aa34cb,ae02a2df4fae1ad46695bec4e2f0edd63313fa0b..04a348c05678ca1fbe665ae836d7b25bcfeba51c
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -574,8 -578,11 +578,11 @@@ buildipfire() 
    ipfiremake squidclamav
    ipfiremake bc
    ipfiremake esniper
- }
 +  ipfiremake mod_perl
 -  ipfiremake hostapd
 -}
+   ipfiremake vnstat
+   ipfiremake vnstati
+   ipfiremake wpa_supplicant
++  ipfiremake hostapd}
  
  buildinstaller() {
    # Run installer scripts one by one