Merge branch 'master' of https://github.com/google/physical-web

Conflicts:
	android/PhysicalWeb/app/version.properties