Merge remote-tracking branch 'cmg-central/CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6' into SSDLbranch

Conflicts:
	CMGTools/TTHAnalysis/python/samples/samples_13TeV_CSA14.py
Merge branch 'SSDLbranch' of github.com:cheidegg/cmg-cmssw into SSDLbranch

Conflicts:
	CMGTools/TTHAnalysis/python/samples/samples_13TeV_CSA14.py