AppEngine changes

Conflicts:
	appengine/.classpath