photo php updated

Conflicts: