Corrections and edits
Merge branch 'master' of https://github.com/GoogleCloudPlatform/solutions-mobile-shopping-assistant-backend-java

Conflicts:
	README.md