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