calculate subjets for softdrop
raise pT threshold for groomed ak8 jet collections
remove duplicate line
fix to subjets in softdrop
add subjets to ak5 softdrop
add subjets to ak5 softdrop
calculate subjets for softdrop

Conflicts:
	RecoJets/JetProducers/python/ak4PFJetsSoftDrop_cfi.py
add subjets to ak5 softdrop

Conflicts:
	RecoJets/JetProducers/python/ak5PFJetsSoftDrop_cfi.py
resolve merge conflict
Revert "raise pT threshold for groomed ak8 jet collections"

This reverts commit 9fbc80a10751a00015edbbddbe2a8a9fc97dbf6d.
New Run1 simulation GT for HCAL response corrections.
Merge pull request #6846 from diguida/autoCond_740pre2

New Run1 simulation GT for HCAL response corrections.
Merge pull request #6817 from ahinzmann/FixSoftdrop

Add subjets to softdrop
Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X