Merging from master

adding feed icons and updating commit history