I am looking for a desktop photo organizer that provides the following two functions:
Create "Albums" (collection of images) without moving or copying the files. The general idea is that one image may appear in multiple "Albums" without being copied into an Album folder. (e.g. something integrated in a photo organizer that works like GNU/Linux symbolic links.)
Batch upload of an entire "Album" to a social website (e.g. Flickr, Facebook).
Google's Picasa has both features, but is awkward to use outside of the G+ ecosystem. I am looking for an alternative that works equally well with most social and photo sharing websites.