adapted Consumers to new class structured and changed factory to use untemplated base types
removed templates from factory
Merge branch 'master' into HEAD

Conflicts:
	DijetAna/src/Consumers/JetLambdaNtupleConsumer.cc
resolve merge conflict