Merge remote-tracking branch 'friendika/master' into newui

diff --cc include/main.js
Simple merge

diff --cc mod/contacts.php
Simple merge

diff --cc mod/network.php
Simple merge

diff --cc mod/notifications.php
Simple merge

diff --cc mod/profile.php
Simple merge

diff --cc mod/profiles.php
Simple merge