Merge branch 'NN_checkoverlap' into 'master'

alternative branch for overlap checking if all particles are basics

See merge request !996
2 jobs for master in 22 seconds (queued for 5 seconds)