Namespace - version prefix
NamespaceUtil, datastore-indexes changes
Appengine xml
config before merge
Merge branch 'master' into container-ruixue

Conflicts:
	.gitignore
	war/WEB-INF/appengine-web.xml