Merge pull request #1 from friendica/master

Merge master from friendica
update fr typoes
update fr: fix typo and ambiguous changes in 1ea73a55e8276006b4c0f0307dfbe2a35acdff33
Merge pull request #720 from magicoli/master

update fr