Merge remote-tracking branch 'ummeegge/wavemon' into next

Conflicts:
	make.sh

diff --cc make.sh
index 7b63bd464f9baeec06b35deb217ca8567a2ff301,9c7532a8d604725ecec01bb81b7a1a388ea67fc5..538151ccd1b608f19ceed9414bb8d3c661378643
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -780,8 -779,7 +780,9 @@@ buildipfire() 
    ipfiremake perl-File-Tail
    ipfiremake perl-TimeDate
    ipfiremake swatch
 +  ipfiremake tor
 +  ipfiremake arm
+   ipfiremake wavemon
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild