Wasn't sure if this was a 4S or iOS 5 issue, but decided on 4S since it has to do with setting up my new phone. Bought it at the Apple Store, connected to their wifi, and told the phone to setup based on the last iCloud backup. Took about 5 min to get the settings, then opened to how my 4 looked. Didn't want to stay in the Apple Store until all my music & apps synced, so I left. Got home, and decided to sync with iTunes, wired, as I didn't want 25+ GB of data to download over wifi. But I first had to go into iCloud settings on my iPhone, and tell it to stop restoring. iTunes restored all my apps, but not organized like I had. No problem with that, I reorganized them. But when I left the Apple Store, it was in the middle of restoring my photos, so I don't have all of them. I was able to tell iTunes to sync with last import from iPhoto, but they're in their own album on my iPhone, and I can't delete any of them. I just want all my photos back in my Camera Roll, like before. Am I going to have to factory reset my phone, and do a wifi restore from my last iCloud backup? Music, apps, and all?