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

diff --cc boot.php
Simple merge

diff --cc include/conversation.php
Simple merge

diff --cc include/items.php
Simple merge

diff --cc include/template_processor.php
Simple merge

diff --cc mod/message.php
Simple merge

diff --cc mod/network.php
Simple merge