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

diff --cc view/theme/diabook/directory_item.tpl
index bc2af16c21f0d25c67534dbc0a9bfc199ee3b076,70d19795513ced1dea3bafbefdbb2cb608d79372..70d19795513ced1dea3bafbefdbb2cb608d79372
mode 100644,100755..100644
--- 1/view/theme/diabook/directory_item.tpl
--- 2/view/theme/diabook/directory_item.tpl
+++ b/view/theme/diabook/directory_item.tpl

diff --cc view/theme/diabook/jot.tpl
index 79151aeedb6dc9059680a653efb9ea322da57564,1d94cb6d3c05752da8b856a4bad13386413ab6a3..1d94cb6d3c05752da8b856a4bad13386413ab6a3
mode 100644,100755..100644
--- 1/view/theme/diabook/jot.tpl
--- 2/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl

diff --cc view/theme/diabook/theme.php
index 83079782e87676a2aa4f5dec69d88e6a2d780128,53048df6cd19e7f5e83bb874f61343396c1793f0..53048df6cd19e7f5e83bb874f61343396c1793f0
mode 100644,100755..100644
--- 1/view/theme/diabook/theme.php
--- 2/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php