Merge remote-tracking branch 'mothur/master'

diff --cc Mothur.xcodeproj/project.pbxproj
index 979b1e69ca8c3c9938e4ab873601b96a5c9e1ecc,b2895e8b73839ec48b795ab0877b0e9aad0eb330..ecb0619a39d993201f9bd102813c9b10b7cc3f0b
--- 1/Mothur.xcodeproj/project.pbxproj
--- 2/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@@ -2273,10 -2360,10 +2361,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.26.0\\\"\"",
-                                       "RELEASE_DATE=\"\\\"7/9/2012\\\"\"",
+                                       "VERSION=\"\\\"1.27.0\\\"\"",
+                                       "RELEASE_DATE=\"\\\"8/8/2012\\\"\"",
                                );
                                GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;

diff --cc chimeraperseuscommand.h
Simple merge

diff --cc chimeraslayercommand.h
Simple merge

diff --cc chimerauchimecommand.h
Simple merge

diff --cc classifyotucommand.h
Simple merge

diff --cc clusterdoturcommand.h
Simple merge

diff --cc clustersplitcommand.h
Simple merge

diff --cc preclustercommand.h
Simple merge

diff --cc shhhercommand.h
Simple merge