change the way jot tools are displayed/hidden
whitespace cleanup
Merge branch 'master' of https://github.com/friendica/red
replace lock icon with icon-{lock, unlock}
use $showacl to show/hide acl in jot.tpl -  remove $pvisit and repair editblock and editlayout which still depended on it.
'anybody in this network' permissions were not being allowed for non-connected channels.
Merge https://github.com/friendica/red into pending_merge
whitespace - nothing else
Merge pull request #399 from git-marijus/master

change the way jot tools are displayed/hidden
issue #400 - lock not showing up for previews of private mentions (or 'new/search' item view)
also reformat the new/search template to pick up recent changes to conv_item.tpl
Merge https://github.com/friendica/red into pending_merge
improve the appearance of the ACL selector in a hackish way on the short term -
it really needs to be re-worked for bootstrap but in any event the words "show" and "don't show" make a mess of it. We should probably just use icons (with a bit of padding) that people can select with a touchscreen and reformat the box accordingly.