Merging to HEAD
Merge branch 'master' of https://github.com/NWUHEP/ntupleProducer

Conflicts:
	src/ntupleProducer.cc
	test/crab.cfg
	test/multicrab_data.cfg