usage message showed wrong number of channels
Merge pull request #125 from cvogeley/master

usage message showed wrong number of channels
quick fix to directory
Merge https://github.com/friendica/red into zpull
site rename issue
Admin templates.
make /channel respect "Maximum number of conversations to load at any time" setting like /network does.
Merge pull request #127 from git-marijus/master

make /channel respect "Maximum number of conversations to load at any time" setting like /network does.