Merge remote-tracking branch 'upstream/master'

Trying to get the image files

Conflicts:
	src/geography-activity/resources/geography/Makefile.am
	src/geography-activity/resources/geography/centralamerica/bahamas.png
	src/geography-activity/resources/geography/centralamerica/belize.png
	src/geography-activity/resources/geography/centralamerica/bg_central_america.png
	src/geography-activity/resources/geography/centralamerica/bg_central_america_blank.png
	src/geography-activity/resources/geography/centralamerica/costa_rica.png
	src/geography-activity/resources/geography/centralamerica/cuba.png
	src/geography-activity/resources/geography/centralamerica/dominican_republic.png
	src/geography-activity/resources/geography/centralamerica/el_salvador.png
	src/geography-activity/resources/geography/centralamerica/guatemala.png
	src/geography-activity/resources/geography/centralamerica/haiti.png
	src/geography-activity/resources/geography/centralamerica/honduras.png
	src/geography-activity/resources/geography/centralamerica/jamaica.png
	src/geography-activity/resources/geography/centralamerica/mexico.png
	src/geography-activity/resources/geography/centralamerica/nicaragua.png
	src/geography-activity/resources/geography/centralamerica/panama.png
	src/geography-activity/resources/geography/centralamerica/puerto_rico.png
	src/geography-activity/resources/geography/northamerica/bahamas.png
	src/geography-activity/resources/geography/northamerica/cuba.png
	src/geography-activity/resources/geography/northamerica/dominican_republic.png
	src/geography-activity/resources/geography/northamerica/haiti.png
	src/geography-activity/resources/geography/northamerica/jamaica.png
	src/geography-activity/resources/geography/oceania/american_samoa.png
	src/geography-activity/resources/geography/oceania/australia.png
	src/geography-activity/resources/geography/oceania/bg_oceania.png
	src/geography-activity/resources/geography/oceania/cook_islands.png
	src/geography-activity/resources/geography/oceania/east_timor.png
	src/geography-activity/resources/geography/oceania/fiji.png
	src/geography-activity/resources/geography/oceania/french_polynesia.png
	src/geography-activity/resources/geography/oceania/hawaii.png
	src/geography-activity/resources/geography/oceania/indonesia.png
	src/geography-activity/resources/geography/oceania/kiribati.png
	src/geography-activity/resources/geography/oceania/marshall_islands.png
	src/geography-activity/resources/geography/oceania/micronesia.png
	src/geography-activity/resources/geography/oceania/new_caledonia.png
	src/geography-activity/resources/geography/oceania/new_zealand.png
	src/geography-activity/resources/geography/oceania/northern_mariana_islands.png
	src/geography-activity/resources/geography/oceania/palau.png
	src/geography-activity/resources/geography/oceania/papua_new_guinea.png
	src/geography-activity/resources/geography/oceania/pitcairn_islands.png
	src/geography-activity/resources/geography/oceania/solomon_islands.png
	src/geography-activity/resources/geography/oceania/tonga.png
	src/geography-activity/resources/geography/oceania/tuvalu.png
	src/geography-activity/resources/geography/oceania/us_minor.png
	src/geography-activity/resources/geography/oceania/vanuatu.png
Merge branch 'master' of https://github.com/gunchleoc/GCompris

Conflicts:
	src/geography-activity/resources/geography/centralamerica/bahamas.png
	src/geography-activity/resources/geography/centralamerica/belize.png
	src/geography-activity/resources/geography/centralamerica/bg_central_america.png
	src/geography-activity/resources/geography/centralamerica/bg_central_america_blank.png
	src/geography-activity/resources/geography/centralamerica/costa_rica.png
	src/geography-activity/resources/geography/centralamerica/cuba.png
	src/geography-activity/resources/geography/centralamerica/dominican_republic.png
	src/geography-activity/resources/geography/centralamerica/el_salvador.png
	src/geography-activity/resources/geography/centralamerica/guatemala.png
	src/geography-activity/resources/geography/centralamerica/haiti.png
	src/geography-activity/resources/geography/centralamerica/honduras.png
	src/geography-activity/resources/geography/centralamerica/jamaica.png
	src/geography-activity/resources/geography/centralamerica/mexico.png
	src/geography-activity/resources/geography/centralamerica/nicaragua.png
	src/geography-activity/resources/geography/centralamerica/panama.png
	src/geography-activity/resources/geography/centralamerica/puerto_rico.png
	src/geography-activity/resources/geography/northamerica/bahamas.png
	src/geography-activity/resources/geography/northamerica/cuba.png
	src/geography-activity/resources/geography/northamerica/dominican_republic.png
	src/geography-activity/resources/geography/northamerica/haiti.png
	src/geography-activity/resources/geography/northamerica/jamaica.png
	src/geography-activity/resources/geography/oceania/american_samoa.png
	src/geography-activity/resources/geography/oceania/australia.png
	src/geography-activity/resources/geography/oceania/bg_oceania.png
	src/geography-activity/resources/geography/oceania/cook_islands.png
	src/geography-activity/resources/geography/oceania/east_timor.png
	src/geography-activity/resources/geography/oceania/fiji.png
	src/geography-activity/resources/geography/oceania/french_polynesia.png
	src/geography-activity/resources/geography/oceania/hawaii.png
	src/geography-activity/resources/geography/oceania/indonesia.png
	src/geography-activity/resources/geography/oceania/kiribati.png
	src/geography-activity/resources/geography/oceania/marshall_islands.png
	src/geography-activity/resources/geography/oceania/micronesia.png
	src/geography-activity/resources/geography/oceania/new_caledonia.png
	src/geography-activity/resources/geography/oceania/new_zealand.png
	src/geography-activity/resources/geography/oceania/northern_mariana_islands.png
	src/geography-activity/resources/geography/oceania/palau.png
	src/geography-activity/resources/geography/oceania/papua_new_guinea.png
	src/geography-activity/resources/geography/oceania/pitcairn_islands.png
	src/geography-activity/resources/geography/oceania/solomon_islands.png
	src/geography-activity/resources/geography/oceania/tonga.png
	src/geography-activity/resources/geography/oceania/tuvalu.png
	src/geography-activity/resources/geography/oceania/us_minor.png
	src/geography-activity/resources/geography/oceania/vanuatu.png