Merge branch 'master' into mybranch

Conflicts:
	Code/InputData/Histo.txt
	Code/Makefile
	Code/Ntuple_Controller.h
	Code/Selection_Factory.cxx