Merge remote-tracking branch 'origin/stable' into altdorf

Merging Ffmuc v2015.5 stable to altdorf branch

Conflicts:
	CHANGELOG.md

site.conf

@@ -10,7 +10,7 @@
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
 
-  mesh_on_wan = true,
+  mesh_on_wan = false,
 
   regdom = 'DE',
 
@@ -43,15 +43,8 @@
     mtu = 1426,
     groups = {
       backbone = {
-      limit = 2,
+      limit = 1,
         peers = {
-          gw02 = {   --[[ mephisto ]]
-            key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0',
-            remotes = {
-              'ipv4 "gw02.ffmuc.net" port 10000',
-              'ipv4 "gw02.freifunk-muenchen.de" port 10000',
-            },
-          },
           gw03 = {   --[[ fpletz ]]
             key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
             remotes = {