Doco - attempt to explain pull requests in git for non developers.
IT: strings updated
Merge pull request #567 from tuscanhobbit/master

IT: strings updated
add collections widget to connections page - and some more work on realms
Merge https://github.com/friendica/red into pending_merge
some more work on realms
diaspora - begin heavy lifting. This is a 738 tonne brick with a herd of elephants standing on it. I'm working on the first tonne or two.
add ability to follow somebody not already in your connections from "post actions" dropdown. bug: doesn't bring you back to this page.
beginning of permission role settings
make lockview provide the right info
Merge pull request #568 from git-marijus/master

make lockview provide the right info
nav channel selection
Merge https://github.com/friendica/red into pending_merge
provide an overt indication that a post/comment was edited.
diaspora - crazy amount of work remaining
really fix lock info
Update nl
fix nl
Merge pull request #569 from git-marijus/master

really fix lock info
really really fix lockview (cross fingers) ;-)