Merge branch 'master' into fast-wcsurface-3

CHANGES/Unreleased.txt

CHANGES/v2.2.txt

Makefile

developer-doc/Makefile

patches/gromacs-2016-beta1.config

patches/gromacs-2016-beta1.diff/src/gromacs/CMakeLists.txt

...macs-2016-beta1.diff/src/gromacs/CMakeLists.txt.preplumed

patches/gromacs-2016-beta1.diff/src/gromacs/mdlib/force.cpp

...acs-2016-beta1.diff/src/gromacs/mdlib/force.cpp.preplumed

...es/gromacs-2016-beta1.diff/src/gromacs/mdlib/minimize.cpp

...-2016-beta1.diff/src/gromacs/mdlib/minimize.cpp.preplumed

patches/gromacs-2016-beta1.diff/src/programs/mdrun/md.cpp

...omacs-2016-beta1.diff/src/programs/mdrun/md.cpp.preplumed

patches/gromacs-2016-beta1.diff/src/programs/mdrun/mdrun.cpp

...cs-2016-beta1.diff/src/programs/mdrun/mdrun.cpp.preplumed

...es/gromacs-2016-beta1.diff/src/programs/mdrun/repl_ex.cpp

...-2016-beta1.diff/src/programs/mdrun/repl_ex.cpp.preplumed

...hes/gromacs-2016-beta1.diff/src/programs/mdrun/runner.cpp

...s-2016-beta1.diff/src/programs/mdrun/runner.cpp.preplumed

patches/gromacs-5.0.7.config