Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixing intro dialog from popping up on failing setup_feeds pref.
Merge remote-tracking branch 'upstream/master'
Fixing crash on ios for reading feed-less stories.
Testing out perf of mongo search on starred stories.
Fixing JS exception on missing users.
Adding search box to all feeds/folders for staff only.
Showing search box.
Fixing disappearing search box.
Fix reading view bottom buttons overflowing on small screens.
Merge pull request #373 from ojiikun/master

Android: UI Fix
Adding search to shared stories, removing from folders.
Fix training dialogue.
Merge pull request #374 from ojiikun/master

Android: Fix Intel Training Actions
Refactored the premium-only message for river in anticipation of premium-only search message.
Typo on border color.
Better top border color.
Adding premium-only search message, enforced API-side. Also fixing display bug around hiding the search bar when clearing out query.