Fixed bug where player would start with 20 because of the photon building being in the scene
Merge remote-tracking branch 'origin/master'