few fixes for photo.rb and album.rb
fixed merge conflicts in photo.rb