update N-subjettiness defaults
update softdrop default
update softdrop default
switch from ca8 pruned jets to ak8 pruned jets in RECO
remove ungroomed ca8 jets from reco
update event content
update B2G validatation
update qjets input
update B2G validatation
resolve merge conflict
fix softdrop jet algorithm
add softdrop DQM
fix in PFJetID calculation due to change in PFJet fraction calculation
Merge pull request #6654 from ahinzmann/JetConfigurationDefaults3

Drop CA8 jets from RECO/AOD, switch to AK8 jets for jet substucture, add softdrop - rebase
Merge pull request #6744 from JetMETdqmval/PfJetID_Func_Fix

fix in PFJetID calculation due to change in PFJet fraction calculation
Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X