preliminary tests of conformal fit
Merge branch 'devel' into conformal-fit
add reference
Merge branch 'devel' into conformal-fit

Conflicts:
	main.cc
first working version of conformal fit
Merge branch 'conformal-fit' into devel

Conflicts:
	Simulation.cc
	main.cc
adapt conformal utils to r-phi smearing