Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
examples/unres/new/MD/DYN_SS/dyn_ss/small.inp
examples/unres/new/MD/DYN_SS/dyn_ss/unres_eval.csh
examples/unres/new/MD/DYN_SS/dyn_ss_from_pdb/small.inp
examples/unres/new/MD/DYN_SS/dyn_ss_from_pdb/small.out_GB000
examples/unres/new/MD/DYN_SS/dyn_ss_from_pdb/small_000.rst
examples/unres/new/MD/DYN_SS/dyn_ss_from_pdb/small_GB000.stat
examples/unres/new/MD/DYN_SS/dyn_ss_from_pdb/small_MD000.pdb
examples/unres/new/MD/DYN_SS/no_ss/small.inp
examples/unres/new/MD/DYN_SS/no_ss/small.out_GB000
examples/unres/new/MD/DYN_SS/no_ss/small_GB000.stat
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F