Merge branch 'nightly' of gitorious.org:social/quix0rs-social into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --cc classes/User_group.php
Simple merge

diff --cc plugins/FacebookBridge/actions/facebookfinishlogin.php
Simple merge

diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge

diff --cc plugins/WikiHowProfile/WikiHowProfilePlugin.php
Simple merge