refactoring to convert strings to more obivous groupings in enums
test adding creds to datastore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.core.resources.prefs
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.m2e.core.prefs
	pom.xml
	src/main/java/com/google/glassware/MainServlet.java