Fix sand, gravel falling stuck
Disable collision fix, its broke unit tests
Merge remote-tracking branch 'upstream/master' into waterfall

Conflicts:
	src/collision.cpp
making waterfall