Moving to eclipse and GAE
Merge branch 'master' of
https://github.com/cjcharles777/ditto-bowl-data-service.git

Conflicts:
	.classpath
	.project
	.settings/.jsdtscope
	.settings/com.google.appengine.eclipse.core.prefs
	.settings/com.google.gdt.eclipse.core.prefs
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.m2e.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	src/main/webapp/WEB-INF/appengine-web.xml