Merge branch 'master' into ov5640-save-button

examples/single_chip/camera_web_server/main/CMakeLists.txt

@@ -7,6 +7,7 @@ set(COMPONENT_REQUIRES
     nvs_flash
     esp_http_server
     fb_gfx
+    mdns
     )
 
 set(COMPONENT_EMBED_FILES

examples/single_chip/camera_web_server/main/app_mdns.c

@@ -97,7 +97,7 @@ const char * app_mdns_query(size_t * out_len)
     p += sprintf(p, "\"framesize\":\"%s\",", framesize);
     p += sprintf(p, "\"stream_port\":\"81\",");
     p += sprintf(p, "\"board\":\"%s\",", CAM_BOARD);
-    p += sprintf(p, "\"model\":\"%s\",", model);
+    p += sprintf(p, "\"model\":\"%s\"", model);
     *p++ = '}';
     *p++ = ',';
 	p += sprintf(p, "\"ip\":\"" IPSTR "\",", IP2STR(&(ip.ip)));