google keys
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/locator_content.xml