Fix image width in updates
REST-ify the feed API
Merge remote-tracking branch 'upstream/master' into upstream