Merge pull request #2 from friendica/master

IT localization updated
Merge branch 'master' of https://github.com/friendica/red
Merge pull request #3 from friendica/master

Merge from upstream
feeds with '@' in the URL were being handled as webfinger addresses and didn't fall through to RSS discovery. Issue #599
Merge pull request #600 from dawnbreak/master

Don't link unknown likes.
we don't always set HUBLOC_FLAGS_DELETED but we often set hubloc_status = HUBLOC_OFFLINE instead. Filter this as well from deliveries.
Merge https://github.com/friendica/red into pending_merge
private mail from d* to r# seems to work with these edits. - Now have to go back the other way.
update pt-br translation
Merge from upstream
Merge from origin
found the sucker
make discover items interactive
better way to deal with effective_uid
trying to call mod/magic on rss resources - which have no hub
more work on d* private messages
d* PM cont.
d* little fixes
update German main help page
Merge pull request #602 from zzottel/master

update German main help page