updated places,dialog,map,people,alert
conflict in manifest before push

Conflicts:
	AndroidManifest.xml