Merge branch 'master' of https://github.com/jottCern/rootana

Conflicts:
	doc.cfg
some bugfixes, including:
 * fix crash in plot because of empty histogram GetDirectory
 * fix muon scale fit
 * read in npv now
Merge branch 'master' of https://github.com/jottCern/rootana
Merge branch 'master' into own_zbb_an

Conflicts:
	plot/bin/plot.cpp
	zsvanalysis/doc.cfg