edit feed: smaller buttons for icon upload; allow uploading larger favicons
include subcategories in generated category feeds
Merge remote-tracking branch 'upstream/master'