marker icon a pumpkin

Conflicts:
	app/src/main/res/drawable-mdpi/booghost.png
	app/src/main/res/drawable-mdpi/candyicons.png
	app/src/main/res/drawable-mdpi/lollypop.png
	app/src/main/res/drawable-mdpi/pumpkin.png