Merge remote-tracking branch 'origin/master' into Sound+Particles

Conflicts:
	src/GameWorld.cpp
Water splash
Merge remote-tracking branch 'origin/master' into Sound+Particles

Conflicts:
	src/GameWorld.cpp
Improved splashes
Not deleting in a "foreach"-loop
Merge remote-tracking branch 'origin/master' into Sound+Particles

Conflicts:
	assets