Merged l1t-devel-CMSSW_7_1_0_pre6 from repository cms-l1t-offline
Merged l1t-devel-CMSSW_7_1_0_pre6 from repository cms-l1t-offline
Merged l1t-devel-CMSSW_7_1_0_pre6 from repository cms-l1t-offline
Merge branch 'l1t-devel-CMSSW_7_1_0_pre6' of github.com:cms-l1t-offline/cmssw into from-CMSSW_7_1_0_pre6
Merge branch 'l1t-devel-CMSSW_7_1_0_pre6' of github.com:cms-l1t-offline/cmssw into mydevel-branch
add dummy LUT files
Fixes for Stage1Layer2 EGamma
Merge branch 'l1t-devel-CMSSW_7_1_0_pre6' of github.com:cms-l1t-offline/cmssw into from-CMSSW_7_1_0_pre6

Conflicts:
	CondFormats/L1TObjects/interface/CaloParams.h
Changes missed fix of merge conflict
Transition to new L1uGtStableParameters
Merge branch 'l1t-devel-CMSSW_7_1_0_pre6' of github.com:cms-l1t-offline/cmssw into mydevel-branch
Merged l1t-devel-CMSSW_7_1_0_pre6 from repository cms-l1t-offline
Fixes for Tau and EG Stage1 algorithms
Merge branch 'l1t-devel-CMSSW_7_1_0_pre6' of github.com:cms-l1t-offline/cmssw into from-CMSSW_7_1_0_pre6
make sure to truncate EGamma collections, fixes infinite loop in GT on HI data
change EGamma nonIso collection to be inclusive
adding configuable e/gamma isolation
Fixed phi mapping
Merge branch 'l1t-devel-CMSSW_7_1_0_pre6' of github.com:cms-l1t-offline/cmssw into mydevel-branch
parameter changes and small fixes