adds the more/less show feature for long status
Merge branch 'staging' into style_and_translate

Conflicts:
	app/assets/javascripts/entries.js
	app/controllers/api/v1/feed/statuses_controller.rb
removes fail, and tests pass