* master:
Upping Android to version 1.2.
Bumping up feed fetching for premiums.
Refunding stripe payments.
ActionBar is part of the repo now (vendorized).
Make initial sync on creation of Main activity folllow recommended two-step API pattern.
Fix feed parsing issue when user has no feeds
Fix crash when new user registers. For some unknown reason the code was doing a feed pull and then always expecting folders when there obviously wouldn't be any if the user just registered.
When login fails go back to login activity rather than previous view
Handle new user registration error reply by informing user of issue with regiration attempt
Conflicts:
apps/profile/models.py
* master:
Fixing stripe reimport
Upping feed fetching by quite a bit.
Fixing double counting stripe payment bug by clearing out striep purchase history when inserting.
* master:
Adding task servers to db firewall.
Adding redis cache. Returning favicon server.
Better munin plugins for redis and mongo.
Removing unused redis keys for shared/comments. Dry-run.
Adding read preference to migration.
Migration to create story_hash for missing feeds.
Making a clearer description of slow feeds.
Upping feed fetches, slowing down fetch interval for less active feeds, setting premium expire time to one year from most recent payment date (as opposed to borked payment gap logic), and adding logginf or tasking feeds.
Switching check for HAProxy'ied socket.io to dev instead of www. Thanks @anaconda!
Sync delay in mongodb and updating story hash migration.
Upping feed fetches.
Fix force close when attempting to fetch a user with a null user.id value
Fix force close updating ProfileActivityFragment if no profile response was received
Move creating ImageLoader in NewsBlurApplication to onCreate to ensure that base context has been set and prevent force close
Boosting fetches.
Fix duplicate requirement
Conflicts:
fabfile.py
