StoryView Options Menu
Merge branch 'master' of https://github.com/sihrc/Story-Quilt

Conflicts:
	StoryQuilt/src/main/java/com/roomates/storyquilt/StoryViewActivity.java