Small bugfix in photon part
Added ECAL energy for PF candidates
Merge branch 'EDMdev' of github.com:ETHZ/ASCore into EDMdev