Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Correctly handle feed count updates with no counts.
Fix updates to saved stories count.
Fix edge case for starred story counting.
Fix unread counts from ghost feeds, correctly pick up feed/folder renames.
Workaround for un-foldered feeds messing up unread counts.
Remove logging that was leaking password data.
Merge pull request #291 from ojiikun/master

Android: Feed/Folder Sync Fixes