Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

diff --cc boot.php
Simple merge

diff --cc include/poller.php
Simple merge

diff --cc mod/ping.php
Simple merge