Did a bit of work on generalizing the BrowseStoriesActivity
Dealt with some merge conflicts.