Merge remote branch 'upstream/master'
Merge remote branch 'origin/master'
Merge branch 'master' of github.com:mexon/friendica-addons
Merge branch 'master' of github.com:mexon/friendica-addons
Merge branch 'master' of github.com:mexon/friendica-addons
Merge branch 'master' of github.com:mexon/friendica-addons
use simple style for sharing on SN
use simple style for sharing on twitter
Merge pull request #115 from tobiasd/snt_newstyle_share

use simple share for SN and T
Merge remote branch 'upstream/master'
Merge remote branch 'origin/master'
Reverse an earlier over-zealous check for a non-null value of the retriever.  This prevented lots and lots of feed items coming through.

Conflicts:

	retriever/retriever.php