Merge branch 'master' of git://github.com/friendica/friendica

diff --cc view/theme/diabook/communityhome.tpl
index ff04d9da0db0657b7e6f2136ee905c388c980d74,66f93c32d825a0ef08ea82909e0541c2379a21f9..66f93c32d825a0ef08ea82909e0541c2379a21f9
mode 100644,100755..100644
--- 1/view/theme/diabook/communityhome.tpl
--- 2/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl

diff --cc view/theme/diabook/diabook-dark/ch_directory_item.tpl
index 0000000000000000000000000000000000000000,db1936e4b725d6cd532b3d347531295e71356c9e..db1936e4b725d6cd532b3d347531295e71356c9e
mode 000000,100755..100644
--- /dev/null
--- 2/view/theme/diabook/diabook-dark/ch_directory_item.tpl
+++ b/view/theme/diabook/diabook-dark/ch_directory_item.tpl

diff --cc view/theme/diabook/diabook-dark/directory_item.tpl
index 0000000000000000000000000000000000000000,bc2af16c21f0d25c67534dbc0a9bfc199ee3b076..bc2af16c21f0d25c67534dbc0a9bfc199ee3b076
mode 000000,100755..100644
--- /dev/null
--- 2/view/theme/diabook/diabook-dark/directory_item.tpl
+++ b/view/theme/diabook/diabook-dark/directory_item.tpl

diff --cc view/theme/diabook/diabook-dark/group_side.tpl
index 0000000000000000000000000000000000000000,8600402f291c429cf61eba8ece8e5c405ce8c928..8600402f291c429cf61eba8ece8e5c405ce8c928
mode 000000,100755..100644
--- /dev/null
--- 2/view/theme/diabook/diabook-dark/group_side.tpl
+++ b/view/theme/diabook/diabook-dark/group_side.tpl

diff --cc view/theme/diabook/diabook-dark/icons/block.png
index 0000000000000000000000000000000000000000,a0b1dffe91473daf6cea96e5e159fec01e5aa831..a0b1dffe91473daf6cea96e5e159fec01e5aa831
mode 000000,100755..100644
Binary files differ

diff --cc view/theme/diabook/theme.php
index 29e71c61154fcd18f45d1632761b5940da3b79c0,e8518a1c6f4423c38b08f2b68ceac21212ccb15a..e8518a1c6f4423c38b08f2b68ceac21212ccb15a
mode 100644,100755..100644
--- 1/view/theme/diabook/theme.php
--- 2/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php