Fixed the bug where photos in an album would always have the same counter in the name
Fixed bug where photos in an album would be named 'album n' instead of the 'album name n'
Fixed bug where duplicate photos would be copied to the library on the filesystem
Merge branch 'master' of https://github.com/bsanders/softeng