Merge pull request #1 from friendica/master

Red master has been merged
Update nl
Merge branch 'master' of https://github.com/friendica/red
fix nl
Merge pull request #569 from git-marijus/master

really fix lock info
really really fix lockview (cross fingers) ;-)
follow => connect
make sure privacy scope is completely reset on second delivery chain - revert if there are forum issues, this is subtle and complicated
also reset comment policy on alternate delivery chains
some work on network discovery
snakebite continued
fangs bared
Merge branch 'master' of https://github.com/friendica/red
greatly simplify consume_feed() - a lot of this was friendica specific and somebody may want to put some of it back in, but we'd be much better off building a zot compatible feed for friendica (hint,hint) - even if it didn't support the other protocol bits. Special purpose feed handlers for things like likes, dislikes, events, and community tags are better handled as zot arrays. We have all those handlers. We just need to pass them a JSON message instead of an XML/Atom message. Handlers for statusnet follow messages are another casualty. That's easy to bring back - but we need to keep driving nails into the XML coffin or the damn zombies will get out.
updated German main.bb doco file
Merge pull request #570 from zzottel/master

updated German main.bb doco file
Merge branch 'master' of https://github.com/friendica/red
provide admin option for allowing rss/atom feed connections. Need to do this now before the feature is complete so that public sites don't get borked. We also will need a service class for this.
Merge https://github.com/friendica/red into pending_merge
move Friendica photo migrator to addons, bring back a few XML scraping functions that we're going to require (unfortunately)