* master:
Fixing Paypal IPN issues by whitelisting profile path.
Fixing provisioning profile.
Dev -> www
Updating ipa
dev -> www
Preparing ios 2.4 for distribution.
Adding symlinks from old media/clients to clients/
Moving ios and android from media to clients.
Fixing scroll on story for traversal buttons in those in between story heights.
# By Samuel Clay (22) and others
# Via Samuel Clay (5) and Daniel (1)
* master: (27 commits)
Fixing SSL errors caused by permissions on a certs file.
Fixing SSL errors on OAuth import.
Fixing munin.
Fixing requirements.
Fixing API docs.
Fixing API docs.
Gunicorn gets the real proxied ip.
Banning missing user agents.
Banning Feed Reader Background app, as it's causing a ton of bogus requests.
Fixing bug in optimized feed river.
Fixing bug for last page of All Site Stories.
Major optimization to both single feed loads and river loads. Both are now checking training only for trained feeds, and river makes only a single subscirption call instead of N subscription calls.
Optimizing feed loads even fruther by checking for training.
Partially fix#295 - add confirmation when marking folder or all stories read with options to mark all read or cancel
Adding mark_story_as_unstarred to the API documentation
Feed reader bg in user client list.
Adding new widnows phone clients to logs.
Fix a minor typo in NBNotifier.h: "with" only has one 'h', not two
Prettifying premium-only notifier in river.
Prettifying premium-only notifier in river.
...
* master:
Cutting out some logging.
Refactoring unread counting for untrained subs. Much faster now that we don't have to fetch stories and read each one.
Fixing PIL issues.
Reverting most PIL cleanup.
Cleaning up PIL.
Better error handling on mark_feed_as_read.
Better logging for unread counts to see where counts are going moving.
Decreasing logging to see if it helps loadtimes.
Decreasing logging to see if it helps loadtimes.
