Merge branch 'devel' into AFM

Merge branch 'devel' into AFM

Conflicts:
	.gitignore
	PARAM/pot_theta_G631_DIL.parm
	bin/unres/MD/unres-mult-symetr_ifort_MPICH_E0LL2Y.exe
	bin/unres/MD/unres_Tc_procor_oldparm_em64-D-symetr.exe
	bin/unres/MD/unres_ifort_MPICH_GAB.exe
	bin/xdrf2ang
	bin/xdrf2pdb
	bin/xdrf2pdb-m
	source/cluster/wham/src-M/energy_p_new.F
	source/maxlik/src_CSA/CMakeLists.txt
	source/unres/src_CSA_DiL/CMakeLists.txt
	source/unres/src_CSA_DiL/Makefile
	source/unres/src_CSA_DiL/csa.F
	source/unres/src_MD-M/COMMON.CONTROL
	source/unres/src_MD-M/DIMENSIONS
	source/unres/src_MD-M/Makefile
	source/unres/src_MD-M/cinfo.f
	source/unres/src_MD-M/energy_p_new_barrier.F
	source/unres/src_MD-M/parmread.F
	source/unres/src_MD-M/refsys.f
	source/unres/src_MD/COMMON.TORSION
	source/wham/src-M/DIMENSIONS
	source/wham/src-M/energy_p_new.F
	source/wham/src-M/readrtns.F
	source/xdrfpdb/src/Makefile