Added a placeable funnel item to collect water when it is raining.
Merge funnels for rain collection.

Conflicts:
	game.cpp
	map.cpp