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 ek rechits to gedPhotons, gedPhotons works
Merge pull request #4746 from lgray/egmFixesSLHC

EGM Fixes -- Shashlik