add vertex fit electron veto decision for PAT photons and hasPixelSeed member function for electron veto
add input variables for photon regression energy correction
fix merge
photon data format fix merging conflict
Increment ClassVersion to 13 and assign it to checksum 3096238365
Merged refs/pull/4337/head from repository cms-sw
fix merging again :( - git rebase from-CMSSW_7_1_X_2014-06-23-0200
Merge pull request #4337 from cms-analysis-tools/7_1_X-photon

7 1 x photon