Adding highlight.js, bigfoot.js, and fitvid.js. Bigfoot needs love.
Remvoing bigfoot.js. It's just not meant for multiple instantiations per-page.
Adding highlight.js, bigfoot.js, and fitvid.js. Bigfoot needs love.
Remvoing bigfoot.js. It's just not meant for multiple instantiations per-page.
Merge pull request #452 from dosiecki/master

Android: 3.5 bugfixes
Bumping android version.
Fixing footnotes.
Merge branch 'jstricks'

* jstricks:
  Fixing footnotes.
  Remvoing bigfoot.js. It's just not meant for multiple instantiations per-page.
  Adding highlight.js, bigfoot.js, and fitvid.js. Bigfoot needs love.

Conflicts:
	media/js/newsblur/views/story_detail_view.js
Handling different scroll views.
Merge pull request #454 from dosiecki/master

Android: Replace requery with cursorloader in Reading.
Android v3.5.2
Merge pull request #455 from dosiecki/master

Android: Fix story loading not to keep paging on error.
Fixing image scaling.
Fixing colors and transparency on android story traversal buttons.
Android v2.5.3.
Essentially stripping photos of size.
Merge pull request #457 from dosiecki/master

Android: Refactor Story Loading
Fixing links with target hashes.
Fixing broken BBC links which have oddball hashes.
Android v3.5.5. Bumping minimum SDK to v11 (3.0+).