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
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
diaspora private mail seems to work now - but there's an obfuscation leak via the conversation structure that needs to be dealt with.
Merge pull request #601 from solstag/master

update pt-br translation
Merge https://github.com/friendica/red into pending_merge
fix url mismatches of a single trailing slash for feed author/owner comparisons; update diaspora_compat
Merge https://github.com/friendica/red into pending_merge
just an experiment - don't do anything with this until I'm finished with it.