Merge branch 'CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6' of https://github.com/CERN-PH-CMG/cmg-cmssw into CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6
Merge branch 'CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6' of github.com:CMSAlphaT/cmg-cmssw into MiniAOD_baseCutFlow