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

diff --cc view/theme/diabook/communityhome.tpl
index ff04d9d,66f93c3..66f93c3
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 0000000,db1936e..db1936e
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 0000000,bc2af16..bc2af16
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 0000000,8600402..8600402
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 0000000,a0b1dff..a0b1dff
mode 000000,100755..100644
Binary files differ

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