fixed viscosity in ulsph
.
Merge branch 'master' of https://github.com/ganzenmg/lammps

Conflicts:
	src/USER-SPH2/pair_sph2_tlsph.cpp