Merge branch 'InputHandling' into HistoHandling

Conflicts:
	Makefile
	include/BaseAnalysis.hh
	src/BaseAnalysis.cc