Merge remote-tracking branch 'mothur/master'

diff --cc Mothur.xcodeproj/project.pbxproj
index f7e48a0119466f512be811abdf92fe39635370c0,ff0e35bbb0bac1d955c7629e75eeb872e2cc1d65..979b1e69ca8c3c9938e4ab873601b96a5c9e1ecc
--- 1/Mothur.xcodeproj/project.pbxproj
--- 2/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@@ -2236,11 -2235,11 +2236,11 @@@
                                GCC_ENABLE_SSE3_EXTENSIONS = NO;
                                GCC_ENABLE_SSE41_EXTENSIONS = NO;
                                GCC_ENABLE_SSE42_EXTENSIONS = NO;
 -                              GCC_OPTIMIZATION_LEVEL = 0;
 +                              GCC_OPTIMIZATION_LEVEL = 3;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "MOTHUR_FILES=\"\\\"../release\\\"\"",
-                                       "VERSION=\"\\\"1.25.0\\\"\"",
-                                       "RELEASE_DATE=\"\\\"5/01/2012\\\"\"",
+                                       "VERSION=\"\\\"1.26.0\\\"\"",
+                                       "RELEASE_DATE=\"\\\"7/9/2012\\\"\"",
                                );
                                "GCC_VERSION[arch=*]" = "";
                                GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@@ -2273,10 -2272,10 +2273,10 @@@
                                GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = "";
 -                              GCC_OPTIMIZATION_LEVEL = 0;
 +                              GCC_OPTIMIZATION_LEVEL = 3;
                                GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "VERSION=\"\\\"1.25.0\\\"\"",
-                                       "RELEASE_DATE=\"\\\"4/30/2012\\\"\"",
+                                       "VERSION=\"\\\"1.26.0\\\"\"",
+                                       "RELEASE_DATE=\"\\\"7/9/2012\\\"\"",
                                );
                                GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;