Update
Merge branch 'sdpd-wip' of github.com:qingguang/lammps-sph into sdpd-wip

Conflicts:
	examples/USER/sdpd/diff/intxy.mac
Merge branch 'sdpd-wip' of github.com:qingguang/lammps-sph into sdpd-wip
Update