Add enum for default feed view and preference methods.
Add dialog for selecting default view.
Update Reading activity to use the default feed view enum.
Pass default story view into Reading activity. Add menus entry for all stories, feeds and folders.
Add default view menu option for all social and saved stories. Use selected preference when viewing stories.
Merge remote-tracking branch 'upstream/master' into defaultview

Conflicts:
	clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
Merge remote-tracking branch 'upstream/master' into defaultview
Use the selected feed view when viewing a story
Merge remote-tracking branch 'upstream/master' into defaultview
Merge pull request #468 from manderson23/defaultview

Android: Add folder/feed preference for story/text view
Fixing bug on empty river.