pierwsza proba merga devela do adasko

pierwsza proba merga devela do adasko
Merge branch 'devel' into adasko

Conflicts:
	.gitignore
	PARAM/pot_theta_G631_DIL.parm
	PARAM/pot_theta_G631_DIL_ext.parm
	bin/unres/MD-M/unres_Tc_procor_oldparm_em64-D-symetr.exe
	bin/unres_clustMD_MPI-oldparm
	bin/wham/wham_multparm-ham_rep-oldparm
	source/cluster/wham/src-M/CMakeLists.txt
	source/cluster/wham/src-M/COMMON.SCCOR
	source/cluster/wham/src-M/cartprint.o
	source/cluster/wham/src-M/chainbuild.o
	source/cluster/wham/src-M/contact.o
	source/cluster/wham/src-M/convert.o
	source/cluster/wham/src-M/energy_p_new.o
	source/cluster/wham/src-M/geomout.o
	source/cluster/wham/src-M/hc.o
	source/cluster/wham/src-M/initialize_p.o
	source/cluster/wham/src-M/int_from_cart1.o
	source/cluster/wham/src-M/main_clust.o
	source/cluster/wham/src-M/parmread.o
	source/cluster/wham/src-M/permut.o
	source/cluster/wham/src-M/proc_proc.o
	source/cluster/wham/src-M/read_coords.o
	source/cluster/wham/src-M/read_ref_str.o
	source/cluster/wham/src-M/readpdb.o
	source/cluster/wham/src-M/readrtns.o
	source/cluster/wham/src-M/rescode.o
	source/cluster/wham/src-M/setup_var.o
	source/cluster/wham/src-M/wrtclust.o
	source/cluster/wham/src-M/xdrf/libxdrf.a
	source/cluster/wham/src/energy_p_new.F
	source/unres/src_MD-M/COMMON.SCCOR
	source/unres/src_MD-M/COMMON.TORSION
	source/unres/src_MD-M/Makefile
	source/unres/src_MD-M/cinfo.f
	source/unres/src_MD-M/stochfric.F
	source/unres/src_MD/COMMON.LOCAL
	source/unres/src_MD/COMMON.SCCOR
	source/unres/src_MD/Makefile
	source/unres/src_MD/cinfo.f
	source/unres/src_MD/parmread.F
	source/wham/src-M/CMakeLists.txt
	source/wham/src-M/cinfo.f
	source/wham/src-M/include_unres/COMMON.SCCOR
	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