Merge branch 'master' into axilrod-teller

# Conflicts:
#	cmake/CMakeLists.txt
#	doc/src/Commands.txt
#	doc/src/Commands_bond.txt
#	doc/src/Howto.txt
#	doc/src/Howto_bioFF.txt
#	doc/src/Howto_coreshell.txt
#	doc/src/Howto_couple.txt
#	doc/src/Howto_diffusion.txt
#	doc/src/Howto_dispersion.txt
#	doc/src/Howto_granular.txt
#	doc/src/Howto_library.txt
#	doc/src/Howto_multiple.txt
#	doc/src/Howto_replica.txt
#	doc/src/Howto_restart.txt
#	doc/src/Howto_temperature.txt
#	doc/src/Howto_tip4p.txt
#	doc/src/Intro.txt
#	doc/src/Intro_authors.txt
#	doc/src/Intro_features.txt
#	doc/src/Intro_nonfeatures.txt
#	doc/src/Manual.txt
#	doc/src/Manual_version.txt
#	doc/src/Packages.txt
#	doc/src/Packages_details.txt
#	doc/src/Packages_standard.txt
#	doc/src/Packages_user.txt
#	doc/src/Section_start.txt
#	doc/src/Speed.txt
#	doc/src/Speed_compare.txt
#	doc/src/Speed_gpu.txt
#	doc/src/Speed_intel.txt
#	doc/src/Speed_kokkos.txt
#	doc/src/Speed_measure.txt
#	doc/src/Speed_omp.txt
#	doc/src/Speed_opt.txt
#	doc/src/Speed_packages.txt
#	doc/src/Speed_tips.txt
#	doc/src/fix_deform.txt
#	doc/src/fix_external.txt
#	doc/src/fix_property_atom.txt
#	doc/src/lammps.book
#	doc/src/neb.txt
#	doc/src/pair_eam.txt
#	doc/src/prd.txt
#	doc/src/run_style.txt
#	doc/src/temper.txt
#	src/version.h