add ek to ecal driven seeding
fix obvious detid problem
updating photon producers for shashlik
Merged refs/pull/4701/head from repository cms-sw

Conflicts:
	SLHCUpgradeSimulations/Configuration/python/combinedCustoms.py
working on Ecal cluster tools
add ecal shashlik to topology
make calo topology safe for weird shashlik setup
photons from shashlik now working
Add the fix for old and new forward pixel DetId numbering to the Phase2 digitiser
Merge pull request #4740 from mark-grimes/addDetIdFixToPhase2Digitiser

Add the fix for old and new forward pixel DetId numbering to the Phase2 digitiser
add ek rechits to gedPhotons, gedPhotons works
Merge pull request #4746 from lgray/egmFixesSLHC

EGM Fixes -- Shashlik
first version
threshold on HCAL
comments
bug fix in GsfElectron part
add separate configuration for electron seeding in EB and EE
finalize splitting of seeding paramenters for EB and EE
split EE HoE thresholds in two
Merge pull request #4772 from matteosan1/topic_EBEEseedingParameters

Topic EBEE seeding parameters