Commit before merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	LF_DEM/BoxSet.cpp
Merge remote-tracking branch 'origin/master'
Small corrections of pair correlation computation in Python tools.