Merge branch release-2016

Trivial conflicts for version number and the fix for gmx
wham duplicated in each branch.

Change-Id: I0ba030398cc2d3679841000a40db6e8a3f7b68cb

diff --cc cmake/gmxVersionInfo.cmake
Simple merge

diff --cc docs/install-guide/index.rst
Simple merge

diff --cc src/gromacs/domdec/domdec.cpp
Simple merge

diff --cc src/gromacs/gmxpreprocess/readir.cpp
Simple merge

diff --cc src/gromacs/mdlib/constr.cpp
Simple merge

diff --cc src/gromacs/mdlib/sim_util.cpp
Simple merge