Places Autocomplete
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	AndroidManifest.xml
	res/menu/main.xml