Conflicts:
	public/gmap.html