Merge branch 'devel' into merge_devel_and_develSC

Conflicts:
	ED_AUX_FUNX.f90
	ED_CHI2FIT.f90
	ED_DIAG.f90
	ED_HAMILTONIAN.f90
	ED_OBSERVABLES.f90
	ED_VARS_GLOBAL.f90
	Makefile