Added moduleId used by sviret
Merge branch 'feature-ntupletools'