Revert "Terrain and water test"

This reverts commit cae22af1bc96ccf7736326cfacd59a4096935253.
Revert "Revert "Terrain and water test""

This reverts commit d6e126d489fe8b9b88bd828399fec6d0b7373397.
Merge remote-tracking branch 'origin/master'