* 'master' of github.com:samuelclay/NewsBlur:
Small cleanup on welcome page, fixing social subs urls.
Updating welcome apge to include pricing and a cleaned up footer.
* master:
Upgrading iphone/ipad app to support both ios 6 and tall-iphone.
New folder options: add subfolder.
Adding location to find friends.
Trimming mongodb lag cutoff to force feeds to correct themselves when slave lag becomes an issue.
Fixing 'r' refresh command for All Site Stories.
Fixing broken social page.
* master: (39 commits)
Ignore skip of unread counts if theres no mongodb lag.
Adding readability vendorized package.
Adding two new functions for stories: collect image sizes and grab original article text. Useful for future features.
Being stricter about non-english characters.
Fixing popular story algorithm to remove non-english stories.
Fixing follow user on blurblogs. Abstracting unshare so I can more easily unshare.
Fixing trainer for stories in social feeds.
Fixing small bug in story titles header now showing socialsubs correctly.
Fixing headers for Everything river and river blurblog.
Massive refactor around feedbar, brought on by @afita, in order to give Folders a menu in the story titles header (and then make the mark as read button work on folders in the header.)
Updating story position in closed story titles when pane is re-opened. Thanks to @afita for the bug.
Updating to altest jQuery layout.
Adding folder story counts to content pane. Thanks to @afita for the suggestion.
Fixing activities bug when the user is unknown and there is no source/with_user.
Calculating correct page fetch timing offset (if it was a 304).
Adding server name and feed code to analytics.
Turning analytics logging back on.
Temporarily commenting out analytics to see if they cure the slow down.
Shortening names on analytics for improved space saving.
Adding new analytics collections to keep track of page loads and feed fetches. Need to start aggregating before I can tell how useful this data will be.
...
Conflicts:
apps/social/models.py
media/js/newsblur/social_page/social_page_assets.js
