Update of trunk from yade master trunk
	modified:   pkg/dem/NCM.cpp
	modified:   pkg/dem/NCM.hpp