Authentication
Merge branch 'master' of https://github.com/biosemantics/etc-site.git

Conflicts:
	.gitignore
	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/ClientModule.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/common/ILoginView.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/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/home/HomeActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/matrixGeneration/MatrixGenerationActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/semanticMarkup/SemanticMarkupActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/settings/ISettingsView.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/settings/SettingsActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/settings/SettingsView.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/content/settings/SettingsView.ui.xml
	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/client/top/LoggedInActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/top/LoggedOutActivity.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/top/LoginTopView.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/top/TopView.java
	src/main/java/edu/arizona/biosemantics/etcsite/client/top/TopView.ui.xml
	src/main/java/edu/arizona/biosemantics/etcsite/server/rpc/AuthenticationService.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/db/ShortUser.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/db/TaskDAO.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/db/User.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/db/UserDAO.java
	src/main/java/edu/arizona/biosemantics/etcsite/shared/rpc/AuthenticationResult.java