* master:
Adding unique index on MStory.
Quick fix to broken usersubs when changing feed link and address.
Fixing bone-headed issue around renaming folders and having all child folders also renamed (client-side only).
All stories in starred stories view now have a score of 1, so they are always displayed.