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

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
	actions/apistatusesshow.php
	actions/apitimelinepublic.php
	actions/logout.php
	actions/public.php

diff --cc actions/apistatusesshow.php
Simple merge

diff --cc actions/apitimelinepublic.php
Simple merge

diff --cc actions/logout.php
Simple merge

diff --cc actions/public.php
Simple merge

diff --cc actions/replies.php
Simple merge

diff --cc actions/shownotice.php
Simple merge

diff --cc actions/showprofiletag.php
Simple merge

diff --cc actions/tag.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc lib/router.php
Simple merge

diff --cc plugins/Favorite/actions/showfavorites.php
Simple merge

diff --cc plugins/Oembed/actions/oembed.php
Simple merge