Merge remote-tracking branch 'upstream/master'

Conflicts:
	retriever/retriever.php
Merge branch 'master' of github.com:mexon/friendica-addons

Conflicts:
	retriever/retriever.php