Merged Branch-FW-0.1 into trunk, using command

"svn merge -r850:1193 https://svn.janelia.org/penglab/projects/v3d/branches/Branch-FW-0.1"
I clumsily resolved conflicts in files mainwindow.cpp, v3d_commandlineparser.h, mainwindow.h, main.cpp, and the webservices/ directory.
I also created a couple of tags under https://svn.janelia.org/penglab/projects/v3d/tags/ representing the two code bases being merged:
  /Branch-FW-0.1_before_merge_into_trunk_18May2011/
  /trunk_before_neuron_annotator_merge_18May2011/

v3d_main/build.macx

@@ -333,15 +333,15 @@ fi
 
 #now automatically execute v3d
 
-if [ $DOIT == "YES" ]; then
-  if [ $SYSTEMBITS == "32" ]; then
-    open v3d/v3d.app &
+#if [ $DOIT == "YES" ]; then
+#  if [ $SYSTEMBITS == "32" ]; then
+#    open v3d/v3d.app &
 #    open v3d/v3d &
-  fi
-  if [ $SYSTEMBITS == "64" ]; then
-    open v3d/v3d64.app &
+#  fi
+#  if [ $SYSTEMBITS == "64" ]; then
+#    open v3d/v3d64.app &
 #    open v3d/v3d64 &
-  fi
-fi
+#  fi
+#fi