Added edit link to feed detail page.
Recompressed the bundle js.
Merge branch 'feed-editing' into integration

Conflicts:
	feedhq/feeds/templates/feeds/entries_list.html
Removed the text next to the read button again and added a JavaScript based prompt.
Merge branch 'endless-pages' into integration