save matrix generation from review result
merge with hong and andrew's
merge with hong and andrew's
merge with hong and andrew's
Merge branch 'master' of https://github.com/biosemantics/etc-site.git

Conflicts:
	.gitignore
	pom.xml
	src/main/java/com/google/gwt/activity/shared/MyAbstractActivity.java
	src/main/java/com/google/gwt/activity/shared/MyActivityManager.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/common/ILoginView.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/common/IResetPasswordView.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/common/LoginPresenter.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/common/LoginView.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/common/MessageOkPresenter.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/common/RegisterPresenter.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/common/ResetPasswordPresenter.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/common/ResetPasswordView.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/annotationReview/AnnotationReviewActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/help/HelpActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/matrixGeneration/MatrixGenerationReviewPresenter.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/matrixGeneration/review/IReviewView.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/matrixGeneration/review/ReviewPresenter.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/settings/ISettingsView.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/taskManager/TaskManagerActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/taxonomyComparison/TaxonomyComparisonActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/treeGeneration/TreeGenerationActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/visualization/VisualizationActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/top/ILoginTopView.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/db/PasswordResetRequestDAO.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/db/ShortUser.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/db/User.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/rpc/AuthenticationResult.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/rpc/PasswordResetResult.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/rpc/RegistrationResult.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/rpc/RequestCaptchaResult.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/rpc/UpdateUserResult.java