Merge branch 'master' of https://github.com/Ombridride/minetest-minetestforfun-server

Conflicts:
	mods/sponge/textures/sponge_sponge.png
	mods/sponge/textures/sponge_sponge_wet.png