Merge pull request #1 from friendica/master

Red master has been merged
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red into upstream
Merge branch 'upstream'
We really can't do this without a hubloc. I was hoping we could, but notifier is setup to take hublocs, not xchans.
Merge remote branch 'upstream/master'
Merge branch 'master' of https://github.com/friendica/red
switch everything over to crypto_encapsulate()
Minor adjustment photo view + update nl (at 100\%\!)
fix nl
add "any connections" to can_comment_on_post() - was missing
Merge https://github.com/friendica/red into pending_merge
unobscure viewsrc items
Merge branch 'master' of https://github.com/friendica/red
diaspora discovery
Merge branch 'master' of https://github.com/friendica/red
onepoll: don't poll archived, blocked, or ignored connections