Merge branch 'CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6' of https://github.com/cbotta/cmg-cmssw into CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6

Conflicts (trivial):
	CMGTools/TTHAnalysis/python/plotter/mca-CSA14.txt
	CMGTools/TTHAnalysis/python/samples/samples_13TeV_CSA14.py