Merge branch 'master' into doc-updates

doc/src/Manual.txt

doc/src/Section_commands.txt

doc/src/Section_intro.txt

doc/src/pair_born.txt

doc/src/pair_cs.txt

doc/src/pair_snap.txt

examples/coreshell/in.coreshell.dsf

examples/coreshell/log.9Nov16.coreshell.dsf.1

src/.gitignore

src/ASPHERE/compute_temp_asphere.cpp

src/BODY/body_nparticle.cpp

src/BODY/compute_body_local.cpp

src/BODY/compute_temp_body.cpp

src/CORESHELL/Install.sh

src/CORESHELL/compute_temp_cs.cpp

src/CORESHELL/pair_born_coul_dsf_cs.cpp

src/CORESHELL/pair_born_coul_dsf_cs.h

src/GRANULAR/fix_pour.cpp

src/GRANULAR/fix_wall_gran.cpp

src/GRANULAR/fix_wall_gran_region.cpp