Merge pull request #718 from tuscanhobbit/dev

Italian translation
Somewhat subtle process_delivery() bug - $public was not being reset if a sys
channel is reached but then the loop iterated over another channel.
Don't allow affinity of 0 in connedit.
rev update
Merge https://github.com/friendica/red into pending_merge

Conflicts:
	version.inc
can't reset public to false because it may have been passed in as true and this would be wrong and cause even more subtle bugs. Reset to whatever value was passed in.
add comodo intermediate certs and a method to add other intermediate certs.
Merge pull request #1 from friendica/master

Merge master from friendica
update fr typoes
update fr: fix typo and ambiguous changes in 1ea73a55e8276006b4c0f0307dfbe2a35acdff33
Put dir back - the fat lady didn't sing afterall.
Merge pull request #720 from magicoli/master

update fr
Merge pull request #2 from friendica/master

Pull from friendica/master
update fr
       - resubmitted, after online tests, correct translations for poked, pinged, etc
       - fix wrong sense for poked
       - there were two different translations for [red:notify], changed to the most used (Red:Notification) everywhere.
update fr - sorry for multiple posts, I will try to find time to check the whole french translation and submit once.
update fr: use prefixFromNow to display time delta in the most used, natural form ("Il y a 2 jours" and not "2 jours auparavant")
update fr: checked mail templates and another bunch of typoes in strings
update fr: 'to prod', better translated by 'encourager'
Merge pull request #721 from magicoli/master

update fr
Missing include if photo album widget called from not-the-photos page.