Merge pull request #2 from friendica/master

Merge from main project
Merge pull request #584 from tuscanhobbit/master

Merge pull request #2 from friendica/master
Revert "Revert "Merge pull request #583 from git-marijus/master""

This reverts commit 08638f3ec88e86def618ff89bdedb9ae9696d218.
another day another concept - hope this works better
Merge pull request #587 from git-marijus/master

try once more :)
should probably still lock autoload during image processing
Merge branch 'master' of https://github.com/friendica/red
argh... this does not do what i thought it would...
issue #588 can't add feeds to collections using connedit page group sidebar widget
Merge https://github.com/friendica/red into pending_merge
Merge pull request #4 from friendica/master

Merge from main project