Merge branch 'master' into cauchystat and resolve conflicts

# Conflicts:
#	cmake/CMakeLists.txt
#	doc/src/Commands_fix.txt
#	doc/src/Packages_details.txt
#	doc/src/Packages_user.txt
#	doc/src/fix_nh.txt
#	doc/src/fixes.txt
#	doc/src/lammps.book
#	src/Makefile