Merge remote-tracking branch 'upstream/master'
Make sure a fresh sync is triggered after a on-upgrade DB wipe.
Make context mark-(un)read conditional. (#350)
Remove extra story view margins. (#505)
Make code block in stories more readable. (#193)
Fix formatting of blockquotes, pres, and explicit paragraphs.
Remove duplicate line.
Merge remote-tracking branch 'upstream/master'
Imporove pre/blockquote/code contrast.
Remove extra margins on images. (#505)
Fix overlay progress circle that was mangled in d7435a079d429b7aa584ed9964ca5f212a406d46.
Fix market-reported NPE.
Merge pull request #508 from dosiecki/master

Android: Bugfixes
Adding useful data to payment history.
Adding logic for chagning credit cards not immediately renewing.
Fixing cancel subscription text.
Expiring -> Renewing
Upping stripe to 1.12.2.
No req for psycopg.