One header too much (grid.hpp)
Merge branch 'master' of git://github.com/espressomd/espresso into shanchen