Refactored EditChoiceActivity
Refactored ViewBrowseChapters
Deleted some commented lines
Refactored ViewStory
Removed commented lines
Merge branch 'JoshWork'