fix mass
Merge pull request #207 from martinamalberti/bugfix_getmass_norm8TeV

bug fix  GetMass in Normalization_8TeV
updated datacard for mva analysis
Import settings for jun 21st 7TeV rereco.
Merge pull request #209 from musella/topic_import_jun21

Import settings for jun 21st 7TeV rereco.
met correction
met correction v2
Merge pull request #210 from aspiezia/master

met correction
correct cut values for vhhad, vhlep and tth categories in config files
Import settings for jun 21st 7TeV rereco.
Merge pull request #211 from michelif/topic_vhlepandhaddiphoMVACuts

correct cut values for vhhad, vhlep and tth categories in config files
Settings for legacy_paper_reduction_7TeV_v2
Merged pull request #214 from musella/tagme_legacy_paper_reduction_7TeV_v2

Conflicts:
	AnalysisScripts/common/jun21rereco_7TeV/energy_scale_offsets.dat
	AnalysisScripts/common/reduction_settings_jun21rereco.dat
Merge pull request #208 from michelif/topic_mvadatafiles

updated datacard for mva analysis
fix diphoton selection for two leptons case
Merge pull request #216 from aspiezia/master

fix diphoton selection for two leptons case
fix in JetHandler::applyJerUncertainty
Merge pull request #217 from pandolf/fixJerSyst

fix in JetHandler::applyJerUncertainty
updating vhhad:one single category
fix:a line was removed by mistake, a switch had a different name(even if not needed)