synch with Phil
synch with Phil
added a second photon to the tree
fix conflicts before merge
Merge pull request #1 from dimatteo/synch01

MZ and KB updates now merged into master.