* master: (115 commits)
Adding webhooks url for paypal.
Better payment reports.
Adding changelog to enterprise deployment. Fixing share dialog on ipad.
iOS app v4.6b1.
Android app v4 beta 7.
Coloring cursor when adding tag.
Adding story tags to add tag popover.
Adding a tag. Ship it!
Fixing issue with off-by-1 numbers when changing tags. Also hiding tags with no stories.
Custom headers for saved story tags.
Better zgrep.
Fixing issues with saving starred story tags on ios. Nearly ready.
Don't recalculate virtual intel column; use it.
Remove unnecessary loader resets in story list.
Don't show inappropriate context menu items for saved stories.
Lower sync priority and fewer unnecessary syncs.
Start story list loader as soon as possible.
Generalise out all story list view creation logic.
Move saved item list to in-time adapter creation.
Move folder item list to in-time adapter creation.
...
Conflicts:
clients/android/NewsBlur/AndroidManifest.xml
clients/android/NewsBlur/src/com/newsblur/activity/ItemsList.java
clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
clients/android/NewsBlur/src/com/newsblur/database/DatabaseConstants.java
clients/android/NewsBlur/src/com/newsblur/database/FolderListAdapter.java
clients/android/NewsBlur/src/com/newsblur/fragment/AllSharedStoriesItemListFragment.java
clients/android/NewsBlur/src/com/newsblur/fragment/AllStoriesItemListFragment.java
clients/android/NewsBlur/src/com/newsblur/fragment/FeedItemListFragment.java
clients/android/NewsBlur/src/com/newsblur/fragment/FolderListFragment.java
clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
clients/android/NewsBlur/src/com/newsblur/fragment/SocialFeedItemListFragment.java
clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
clients/ios/Classes/NewsBlurAppDelegate.h
clients/ios/Classes/StoriesCollection.m
clients/ios/Classes/StoryDetailViewController.m
clients/ios/NewsBlur.xcodeproj/project.pbxproj
clients/ios/static/storyDetailView.css
* master:
db03 is no longer a db.
Redis to db01.
Logging stripe use.
Paywall on signup.
Extending random holds for feeds while being crushed.
Minimum of MEMORY/256 workers.
Minimum of MEMORY/256 workers.
Bumping gunicorn workers.
Only recount feeds if necessary.
Only recount feeds if necessary.
Conflicts:
media/css/reader.css
