now using userFloat to add new variables in photon.h
added methods to produce some new shower shape variables in photonproducer
Merge branch 'dev_michael' into temp

Conflicts:
	MicroAODProducers/plugins/PhotonProducer.cc