back to eclipse
pre merge
Merge branch '20140213-maven'

Conflicts:
	.classpath
	.metadata/.plugins/org.eclipse.debug.core/.launches/choral-aroma.launch
	.project
	.settings/com.google.appengine.eclipse.core.prefs
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.project.facet.core.xml
	gwt-unitCache/gwt-unitCache-000001442E5A3B38
	gwt-unitCache/gwt-unitCache-000001442E6BE591
	gwt-unitCache/gwt-unitCache-000001442E6BE5A7
	gwt-unitCache/gwt-unitCache-000001442E6BE6B7
	src/META-INF/jdoconfig.xml
	src/META-INF/persistence.xml
	src/com/digiburo/choral/aroma/Choral_aroma.gwt.xml
	src/com/digiburo/choral/aroma/bizlogic/entity/UserLog.java
	src/com/digiburo/choral/aroma/bizlogic/service/UserLogService.java
	src/com/digiburo/choral/aroma/bizlogic/servlet/AbstractServlet.java
	src/com/digiburo/choral/aroma/bizlogic/servlet/DiagnosticServlet.java
	src/com/digiburo/choral/aroma/bizlogic/servlet/HomeServlet.java
	src/com/digiburo/choral/aroma/gae/entity/UserLog.java
	src/com/digiburo/choral/aroma/gae/service/UserLogService.java
	src/com/digiburo/choral/aroma/gae/servlet/AbstractServlet.java
	src/com/digiburo/choral/aroma/gae/servlet/DiagnosticServlet.java
	src/com/digiburo/choral/aroma/gae/servlet/TestServlet.java
	src/main/java/com/digiburo/choral/aroma/gae/entity/UserLog.java
	src/main/java/com/digiburo/choral/aroma/gae/service/UserLogService.java
	src/main/java/com/digiburo/choral/aroma/gae/servlet/AbstractServlet.java
	src/main/java/com/digiburo/choral/aroma/gae/servlet/DiagnosticServlet.java
	src/main/java/com/digiburo/choral/aroma/gae/servlet/TestServlet.java
	war/WEB-INF/appengine-web.xml
	war/WEB-INF/classes/META-INF/jdoconfig.xml
	war/WEB-INF/classes/META-INF/persistence.xml
	war/WEB-INF/classes/com/digiburo/choral/aroma/Choral_aroma.gwt.xml
	war/WEB-INF/lib/appengine-api-1.0-sdk-1.8.4.jar
	war/WEB-INF/lib/appengine-api-labs.jar
	war/WEB-INF/lib/appengine-endpoints.jar
	war/WEB-INF/lib/gwt-servlet.jar
	war/WEB-INF/web.xml