Merge remote branch 'upstream/master'

Conflicts:
	twitter/twitter.php
Merge branch 'master' of github.com:mexon/friendica-addons
Merge branch 'master' of github.com:mexon/friendica-addons
Ensure that the http code gets updated even on failure, and fix stupid mistake that would prevent the table ever being updated anyway