Merge pull request #116 from tobiasd/master

char limit for Twitter needs to set lower because of t.co
update addons template dir layout
Merge pull request #118 from fabrixxm/templateengine

update addons template dir layout
add 'superblock' blocker, plus package updates
oops - forgot the files
superblock testing - couple of minor issues
package update
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
Clarify the language of the help text a little
Merge remote-tracking branch 'upstream/master' into retriever

Conflicts:
	retriever/view/help.tpl
Merge pull request #119 from mexon/retriever

Reverse an earlier over-zealous check for a non-null value of the retrie...
updates
Merge https://github.com/friendica/friendica-addons into apull