remove testVariable from Photon
Merge pull request #9 from sethzenz/master

remove testVariable from Photon
Adding the ChargedPFIso computation to the photon preselection
Merge remote-tracking branch 'upstream/master' into dev_Olivier

Conflicts:
	MicroAODProducers/plugins/PhotonProducer.cc