added map_url to json
conflicts fixed
added slogan