Removing OHAttributedLabel, but the new attributed label sucks.
Merge branch 'offline' into ios6

* offline: (247 commits)
  Adding preferences for offline story limit and image download concurrency.
  Better next unread button min width in narrow mode.
  Fixing tooltip on Full view.
  Speeding up new user queue.
  Adding starred stories to munin.
  Showing empty explainers.
  Cleaning up starred story trimmer.
  New starred story trimmer.
  Turning off SSL verification on text importing.
  Using latest feedparser.
  Adding Xcode5-specific directories to gitignore.
  Fixing crash on iOS 7 for offline stories. Still looks like shit.
  Bumping feed blast limit from 50 to 100 stories at a time.
  Need to pass story order and read filter to sync service when refresh triggered in AllSharedStoriesReading activity
  Fixing autocomplete to not choke on missing feeds.
  Fix #351 - support oldest first/unread for viewing all shared stories and individual blurblogs
  Fixing spacebar and arrow keys for new scroll story list.
  Normaling user agents between feed/page/icon fetchers. Adding full site permalink.
  Fixing text view.
  Fixing esc key to close popovers and menus without closing current feed.
  ...

Conflicts:
	clients/ios/NSAttributedString+Attributes.h
	clients/ios/NSAttributedString+Attributes.m
	clients/ios/OHAttributedLabel.h
	clients/ios/OHAttributedLabel.m
Merge branch 'master' into ios6

# By Samuel Clay (54) and others
# Via Samuel Clay (16) and ojiikun (3)
* master: (64 commits)
  Fixing new uiactivities for ipad.
  v2.4.1 of iOS app, ready for enterprise distribution.
  Preference to hide public comments on iOS. Ready to ship for beta testing!
  Removing debugging.
  Fixing send to button on Original view. Now the two are finally linked together.
  Fixing three bugs: proper caching of feed list in offline mode, fixing crash on loading feed when previously read stories, and stories showing up read in folders with an unread filter.
  Adding new send to button to traversal bar. Now isntapaper is 2 clicks.
  Fixing Pinboard images for use in preferences.
  Adding Pinboard and Chrome.
  Fixing Pocket.
  Using native UIActivity. Readability and Pocket don't work yet.
  Fixing unread stories being overwritten in the inbetween time from offline to online when loading stories.
  Refactor sync service task types to use enums.
  Refactor result codes for SyncService into enums. Remove deleteFeed from SyncService in preference to standard API call.
  Switch all mark-read ops to new API using story_hash.
  Fixing timestamp issue on image order.
  Lots of offline progress: cancelling sync in the middle of one correctly, fixing bug around missing story hashes in sync, updating progress bar more often, fixing image caching bug that preventing caching from running at all.
  Fixing Dilbert-specific encoding error.
  Adding logging to profile views.
  Fixing encoding on Original pages. Thanks @bruceyou for the wonderful help!
  ...
Merge branch 'master' into ios6

# By Samuel Clay (39) and ojiikun (6)
# Via ojiikun (5) and Samuel Clay (4)
* master: (45 commits)
  Fixing unread counts bug on ios.
  Allowing up/down arrow keys to take you out of search box and into results.
  Refactoring the snot out of the keyboard shortcuts dialog, sorting them into tabs/groups. Moving keyboard shortcut 'f' to 'shift+t' (train feed), killing old 'shift+t' to hide story titles (now unnecessary thanks to the Full view), and adding '/' to search feed.
  Adding search logging.
  Adding premium-only search message, enforced API-side. Also fixing display bug around hiding the search bar when clearing out query.
  Better top border color.
  Typo on border color.
  Refactored the premium-only message for river in anticipation of premium-only search message.
  Fix training dialogue.
  Adding search to shared stories, removing from folders.
  Fix reading view bottom buttons overflowing on small screens.
  Fixing disappearing search box.
  Showing search box.
  Adding search box to all feeds/folders for staff only.
  Fixing JS exception on missing users.
  Testing out perf of mongo search on starred stories.
  Fixing crash on ios for reading feed-less stories.
  Fixing intro dialog from popping up on failing setup_feeds pref.
  Fixing text sizes on Android.
  Fixing colors on favicon-less feeds in android.
  ...
Showing offline/fetching messages correctly.
Merge branch 'master' into offline

* master:
  Handing out free accounts a little quicker.
  Adding count of trimmed stories.
  Adding redis backup for new redis stroy server.
  Adding Buffer as a share option.
  Moving story hash db to its own server (primary).
  Adding cost to fabfile's list_do.
  Moving node server to db pubsub role.
  Moving from specific db hosts to db roles, editable through /etc/hosts.
Merge branch 'master' into offline

# By Samuel Clay (12) and ojiikun (6)
* master:
  Handling stats feed count for blurblog itself.
  Showing correct feed titles in blurblog stats.
  Fixing broken social stats.
  Adding ellipses in webkit.
  Adding downtime handling to readme.
  Putting a max on sporadic checks on broken feeds to 8x normal amount.
  Complete styling of overlay buttons.
  Only turn real-time feeds into lazy feeds if there is a track record of push notifications.
  Switching Email Story menu item to show email icon.
  Turning off redis dupe story id writer.
  Correct haproxy config to account for new http layer 7 health checks from nginx.
  Cleaning up haproxy debug, logrotate.
  Stripping tags in blurblog settings.
  Placeholder styling of overlay buttons.
  Enable/disabe state for overlay buttons.
  Make overlay buttons fuctional.
  Basic overlay button UI.
  Fix crash on marking all stories read (#382)
New user queue every 5 minutes.
Merge branch 'master' into offline

# By Samuel Clay (29) and ojiikun (3)
# Via Samuel Clay (3) and ojiikun (1)
* master: (32 commits)
  New user queue every 5 minutes.
  Fixing unknown host error on DO servers.
  Using All Site Stories instead of Top Level on folder chooser.
  Adding new preference for auto-opening a default folder on load.
  Unread counter overlay widget for feeds and social feeds.
  Fixing memory leak when reloading feeds (after add/remove/move), found entirely through @mihaip's hard work. Thanks!
  Disallowing single subscriber feeds to be loaded by non-subscribers.
  Fixing #383. Need a way to retrieve starred stories by hash.
  Previous story button takes you up, no longer to previous story. Should've done this a while ago.
  Adding story intelligence score tip to API.
  Adding user_profile to /reader/feeds. Has is_premium field, as well as web preferences.
  Switching feed link to point ot the feed's permalink, not a feed filter on the blurblog.
  Preventing popular from sharing stories from the same feed id in the same batch.
  Upping delay on new user queue.
  Fixing jenny holzer quote at end of blurblogs.
  Adding better error logging/messaging for marking stories as starred.
  Adding better error logging/messaging for marking stories as starred.
  Fixing broken icon bug.
  Fixing missing user_id in comment's replies and likes.
  Posting popular shared stories to twitter.
  ...
Merge branch 'offline'

* offline:
  Showing offline/fetching messages correctly.
NSConditionLocks when fetching stories to handle race conditions between fetching next set of stories and storing recently fetched stories.
Adding reachability preference (wifi only vs wifi + cellular).
Allowing single subscriber feeds to be seen, as it prevented tryfeeds from working.
Fixing mismatch when marking stories as read when offline.
Users work while offline. Also adding messaging for offline sharing/replying errors.
Adding messaging to training while offline in both trainer view controller and story detail view controller.
New notifier progress bar.
New enterprise build -> 2.4.4. Can be considered an RC1.
Switching provisioning profiles for the year.
Moving to simpler read story endpoint.