Merge remote-tracking branch 'github/master' into adaptglok

* water potentials: TIP3P, TIP4P, SPC

* implicit solvent potentials: hydrodynamic lubrication, Debye

* force-field compatibility with common CHARMM, AMBER, DREIDING,     OPLS, GROMACS, COMPASS options

* access to the `OpenKIM Repository <http://openkim.org>`_ of potentials via     :doc:`kim\_init, kim\_interactions, and kim\_query <kim_commands>` commands

* access to the `OpenKIM Repository <http://openkim.org>`_ of potentials via     :doc:`kim_init, kim_interactions, and kim_query <kim_commands>` commands

* hybrid potentials: multiple pair, bond, angle, dihedral, improper     potentials can be used in one simulation

* overlaid potentials: superposition of multiple pair potentials

* src/RIGID: filenames -> commands

* :doc:`compute erotate/rigid <compute_erotate_rigid>`

* fix shake"_fix\_shake.html

* :doc:`fix shake <fix_shake>`

* :doc:`fix rattle <fix_shake>`

* :doc:`fix rigid/\* <fix_rigid>`

* examples/ASPHERE

Additional to the cosine term the *cosine/buck6d* angle style computes

the short range (vdW) interaction belonging to the

:doc:`pair\_buck6d <pair_buck6d_coul_gauss>` between the end atoms of the

:doc:`pair_style buck6d <pair_buck6d_coul_gauss>` between the end atoms of the

angle.  For this reason this angle style only works in combination

with the :doc:`pair\_buck6d <pair_buck6d_coul_gauss>` styles and needs

with the :doc:`pair_style buck6d <pair_buck6d_coul_gauss>` styles and needs

the :doc:`special_bonds <special_bonds>` 1-3 interactions to be weighted

0.0 to prevent double counting.

*cosine/buck6d* can only be used in combination with the

:doc:`pair\_buck6d <pair_buck6d_coul_gauss>` style and with a

:doc:`pair_style buck6d <pair_buck6d_coul_gauss>` style and with a

:doc:`special_bonds <special_bonds>` 0.0 weighting of 1-3 interactions.

This angle style can only be used if LAMMPS was built with the

""""""""""""""""

:doc:`angle_coeff <angle_coeff>`,

:doc:`angle\_cosine\_shift\_exp <angle_cosine_shift_exp>`

:doc:`angle_style cosine/shift/exp <angle_cosine_shift_exp>`

**Default:** none

""""""""""""""""

:doc:`angle_coeff <angle_coeff>`,

:doc:`angle\_cosine\_shift <angle_cosine_shift>`,

:doc:`dihedral\_cosine\_shift\_exp <dihedral_cosine_shift_exp>`

:doc:`angle_style cosine/shift <angle_cosine_shift>`,

:doc:`dihedral_style cosine/shift/exp <dihedral_cosine_shift_exp>`

**Default:** none