Merge simon_master_3D -> pfem_dem

Merge and check all particles problem. Should not break anything in the fluid.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information