Merge branch 'experimental' into testing

extra/template.conf

@@ -226,7 +226,7 @@
 
 	-- link to map
 	status_page = {
-		location_link = 'https://map.hochstift.freifunk.net/#!v:m;n:',
+		location_link = 'https://map.hochstift.freifunk.net/#/de/map/',
 	},
 
 	-- geo-default site

site.mk

@@ -71,7 +71,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.0.4~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.0.5~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)