Merge branch 'working'
feeds now refresh
all images added
Merge branch 'master' into working