Merge branch 'multi-server' into newpointone

Conflicts:
	src/zm_monitor.cpp

docs/conf.py

@@ -103,8 +103,8 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-#html_theme = 'default'
-html_theme = 'sphinx_rtd_theme'
+html_theme = 'default'
+#html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

src/zm_monitor.cpp

@@ -2802,6 +2802,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
         signal_check_colour = strtol(dbrow[col]+1,0,16);
     else
         signal_check_colour = strtol(dbrow[col],0,16);
+	col++;
     bool embed_exif = (*dbrow[col] != '0'); col++;
 
     int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);