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.
  ...
Stubbing out starred story tags.
Adding story tagging UI to sideoptions.
Merge branch 'master' into tagging

* master:
  Adding folder search for admin only. If you're reading this commit message, don't get excited. I probably won't be launching folder search using this method. It'll be a while before I can ship it. But if for some strange reason folder search is much faster than I thought, this has a chance.
  Fixing rounded corners on Android. Also fixing a few spacing issues.
Adding tagging. Need to fix the auto-resizing, but tagging is looking good.
Logging heights.
Merge branch 'master' into tagging

* master:
  Showing OPML errors and fixing unicode decode error by sanitizing OPML uploads.
Merge branch 'master' into tagging

* master:
  Fixing sideoptions when on bottom.
  Correcting homepage river number.
Trying to rewrite sideoptions resize.
Fixing inconsistency when opening both sideoptions.
Merge branch 'master' into tagging

* 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.
  New ssh keys, syn_cookies setting for redis pubsub server.
  Handling socket level errors in socketio/node.
  Catching exceptions for node redis.
  Catching exceptions for node redis.
  Trying to fix issues on node redis connection.
  Handling redis connection timeouts in node.
Sending user_tags on story tagging (both additions and subtractions). Upgrading Backbone to 1.0 for improved model silencing behavior.
Merge branch 'master' into tagging

* master:
  Correct haproxy config to account for new http layer 7 health checks from nginx.
  Cleaning up haproxy debug, logrotate.
  Stripping tags in blurblog settings.
Storing user tags and retrieving in all views.
Showing tags on load. Just need counts and tag feeds.
Stubbing in collapse folder icon for starred stories.
Merge branch 'master' into tagging

* master:
  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.