adds token img source to status api call
short polling in place for friend statuses
Merge branch 'staging' into status_polling
show and hide worksheet on work a step page
fixing the specs
mergies fixed
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