Merge branch 'master' into core50

Conflicts:
	config/rootfiles/core/50/filelists/icons

html/cgi-bin/logs.cgi/log.dat

@@ -60,7 +60,7 @@ my %sections = (
         'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
         'auth' => '(\w+\(pam_unix\)\[.*\]: )',
         'kernel' => '(kernel: (?!DROP_))',
-        'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon\[.*\]: |vpnwatch: )',
+        'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
         'openvpn' => '(openvpnserver)\[.*\]: ',
         'pakfire' => '(pakfire:) ',
         'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) '

html/cgi-bin/portfw.cgi

@@ -1038,7 +1038,7 @@ sub disallowreserved
 {
 	# port 67 and 68 same for tcp and udp, don't bother putting in an array
 	my $msg = "";
-	my @tcp_reserved = (81,222,444);
+	my @tcp_reserved = ();
 	my $prt = $_[0]; # the port or range
 	my $ryn = $_[1]; # tells us whether or not it is a port range
 	my $prot = $_[2]; # protocol