fixed a bug in MPI restraints
fix Makefile under water directory
add Makefile to sample directory
Import of OOPSE v. 2.0