Merge branch 'master' of https://github.com/ojiikun/NewsBlur into pr/130-test
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into pr/130-test
Handle new user registration error reply by informing user of issue with regiration attempt
When login fails go back to login activity rather than previous view
Merge branch 'master' of https://github.com/samuelclay/NewsBlur
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.
Fix feed parsing issue when user has no feeds
Merge pull request #141 from lance0428/master

Several fixes around login and registering new account
Make initial sync on creation of Main activity folllow recommended two-step API pattern.
Merge pull request #143 from ojiikun/master

Android: Follow Recommended 2-step Sync on Load
ActionBar is part of the repo now (vendorized).
Refunding stripe payments.
Bumping up feed fetching for premiums.
Upping Android to version 1.2.
Merge branch 'master' into circular

* 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