Merge branch 'adasko' into bartek with corrections

Merge branch 'adasko' into bartek with corrections

Conflicts:
	PARAM/pot_tor_G631_DIL_ext.parm
	bin/wham/wham_multparm-ham_rep-oldparm
	source/unres/src_MD-M/cinfo.f
	source/unres/src_MD/COMMON.SCCOR
	source/unres/src_MD/Makefile
	source/unres/src_MD/cinfo.f
	source/unres/src_MD/parmread.F
	source/unres/src_MD/readrtns.F
	source/wham/src-M/cinfo.f
	source/wham/src/Makefile
	source/wham/src/cinfo.f
	source/wham/src/enecalc1.F
	source/wham/src/energy_p_new.F
	source/wham/src/include_unres/COMMON.SCCOR
	source/wham/src/int_from_cart.f
	source/wham/src/parmread.F